From patchwork Thu Jul 10 08:17:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 368532 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6FFE31400AF for ; Thu, 10 Jul 2014 18:34:21 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753026AbaGJIdR (ORCPT ); Thu, 10 Jul 2014 04:33:17 -0400 Received: from mail-lb0-f177.google.com ([209.85.217.177]:52055 "EHLO mail-lb0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752112AbaGJISU (ORCPT ); Thu, 10 Jul 2014 04:18:20 -0400 Received: by mail-lb0-f177.google.com with SMTP id u10so5707046lbd.22 for ; Thu, 10 Jul 2014 01:18:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=p+/L/J8lSNLHHqJevu2mojtyuiZdptLgqNz/5Hb+QI4=; b=MVrtF1ebLqgY5JeDfC/kJlEdjWHoUSBAprl64RT7vMs3Fgt97NCz9YVcB/S8WqbV9v 3xHc3VSsw49F9Z2Zx/04lqVc0XZlJcnKYS5miVWdOOEfxN4x+b8YLPyiZC28hVy6i+pH SnRxcIBuYUPuy4k8PxI61FJLMRZM1SuTw3J97klQxOaRkn4XO38LxXKf7dcjpFotOKRg 4fu/01DGtx4UWAI3QeAn7itFIvbg+KAqeK0gBJ5FdlyqG+uajGt/KDTeEWwpAeCm8VWq CRumUH9SC9hALjsBX4vJzGzxOSmlFJAH5cB0tdId5/BqhfY1AGBSoz5fGZLLmUPe9x5W V38g== X-Gm-Message-State: ALoCoQkiLLM5M9y7PIbrzP8tse+Xcnos6EoQ7K4SVesz04baFY1EoZEOKasYxAaFx2xf0VFAIcQ+ X-Received: by 10.112.91.163 with SMTP id cf3mr2789306lbb.42.1404980298709; Thu, 10 Jul 2014 01:18:18 -0700 (PDT) Received: from localhost.localdomain (m188-149-105-114.cust.tele2.no. [188.149.105.114]) by mx.google.com with ESMTPSA id tg1sm37154793lbb.11.2014.07.10.01.18.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jul 2014 01:18:17 -0700 (PDT) From: Tom Gundersen To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, David Miller , David Herrmann , Kay Sievers , Tom Gundersen , Dmitry Eremin-Solenikov , linux-zigbee-devel@lists.sourceforge.net Subject: [PATCH v7 09/33] net: nl802154 - make add_iface take name assign type Date: Thu, 10 Jul 2014 10:17:14 +0200 Message-Id: <1404980258-30853-10-git-send-email-teg@jklm.no> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1404980258-30853-1-git-send-email-teg@jklm.no> References: <1404980258-30853-1-git-send-email-teg@jklm.no> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Tom Gundersen Cc: Dmitry Eremin-Solenikov Cc: linux-zigbee-devel@lists.sourceforge.net Acked-by: Alexander Aring --- include/net/wpan-phy.h | 4 +++- net/ieee802154/nl-phy.c | 5 ++++- net/mac802154/ieee802154_dev.c | 7 ++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/net/wpan-phy.h b/include/net/wpan-phy.h index 10ab0fc..bb07a1b 100644 --- a/include/net/wpan-phy.h +++ b/include/net/wpan-phy.h @@ -58,7 +58,9 @@ struct wpan_phy { int idx; struct net_device *(*add_iface)(struct wpan_phy *phy, - const char *name, int type); + const char *name, + unsigned char name_assign_type, + int type); void (*del_iface)(struct wpan_phy *phy, struct net_device *dev); int (*set_txpower)(struct wpan_phy *phy, int db); diff --git a/net/ieee802154/nl-phy.c b/net/ieee802154/nl-phy.c index 89b265a..dc0c8f7 100644 --- a/net/ieee802154/nl-phy.c +++ b/net/ieee802154/nl-phy.c @@ -174,6 +174,7 @@ int ieee802154_add_iface(struct sk_buff *skb, struct genl_info *info) struct wpan_phy *phy; const char *name; const char *devname; + unsigned char name_assign_type; int rc = -ENOBUFS; struct net_device *dev; int type = __IEEE802154_DEV_INVALID; @@ -192,8 +193,10 @@ int ieee802154_add_iface(struct sk_buff *skb, struct genl_info *info) if (devname[nla_len(info->attrs[IEEE802154_ATTR_DEV_NAME]) - 1] != '\0') return -EINVAL; /* phy name should be null-terminated */ + name_assign_type = NET_NAME_USER; } else { devname = "wpan%d"; + name_assign_type = NET_NAME_ENUM; } if (strlen(devname) >= IFNAMSIZ) @@ -227,7 +230,7 @@ int ieee802154_add_iface(struct sk_buff *skb, struct genl_info *info) } } - dev = phy->add_iface(phy, devname, type); + dev = phy->add_iface(phy, devname, name_assign_type, type); if (IS_ERR(dev)) { rc = PTR_ERR(dev); goto nla_put_failure; diff --git a/net/mac802154/ieee802154_dev.c b/net/mac802154/ieee802154_dev.c index 1a79072..ebd9e79 100644 --- a/net/mac802154/ieee802154_dev.c +++ b/net/mac802154/ieee802154_dev.c @@ -158,7 +158,8 @@ mac802154_del_iface(struct wpan_phy *phy, struct net_device *dev) } static struct net_device * -mac802154_add_iface(struct wpan_phy *phy, const char *name, int type) +mac802154_add_iface(struct wpan_phy *phy, const char *name, + unsigned char name_assign_type, int type) { struct net_device *dev; int err = -ENOMEM; @@ -166,12 +167,12 @@ mac802154_add_iface(struct wpan_phy *phy, const char *name, int type) switch (type) { case IEEE802154_DEV_MONITOR: dev = alloc_netdev(sizeof(struct mac802154_sub_if_data), - name, NET_NAME_UNKNOWN, + name, name_assign_type, mac802154_monitor_setup); break; case IEEE802154_DEV_WPAN: dev = alloc_netdev(sizeof(struct mac802154_sub_if_data), - name, NET_NAME_UNKNOWN, + name, name_assign_type, mac802154_wpan_setup); break; default: