From patchwork Wed Jul 16 22:43:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 370899 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 95277140093 for ; Thu, 17 Jul 2014 08:45:41 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754762AbaGPWpW (ORCPT ); Wed, 16 Jul 2014 18:45:22 -0400 Received: from mail-la0-f43.google.com ([209.85.215.43]:36186 "EHLO mail-la0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754745AbaGPWpT (ORCPT ); Wed, 16 Jul 2014 18:45:19 -0400 Received: by mail-la0-f43.google.com with SMTP id hr17so1132166lab.2 for ; Wed, 16 Jul 2014 15:45:16 -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=FZMgJxcGvd/y3ZASofZZzNfReZP1SFoh/FkWm6j+SkA=; b=NtDna1qqVvil+xeQIqJtci5OiUplNyPFGst30KMR8D6u9HysFqgL9yBOzMi4Asaujd zlDR0VyjKqkinirlK/HisnlUeo5zUmxAhq2ahGvraK/qFMrNSuAEvQCrDc+5DaS2bm9K yIV1XqkvnbBEvA7gp+8o8DqqfEy6a5RY3FMxO8Cm6MJRQj5nbzeN2iXcfMBChY2PnT1I ebiAhk2cSENrnLedZz9U2aRxN6MBhY0j3IivyipjIJ2z9xzhXV02GRrW4h6epbURKmRk jUZdZs7duI5EljyvURAGzJQs2nWyt/aXmpAg6S9pizMXthCP6zAfEjRQmueW+jMtvaav C9ig== X-Gm-Message-State: ALoCoQnjfLhx0ocAl3lQIIWbtcjALxUWJuZ4H7QYo3jsOtF0gE12G95UzdQ4FLpXe3eZ2CDLPm19 X-Received: by 10.112.136.164 with SMTP id qb4mr16034357lbb.61.1405550716812; Wed, 16 Jul 2014 15:45:16 -0700 (PDT) Received: from tomegun-x240.localdomain (cm-84.208.72.173.getinternet.no. [84.208.72.173]) by mx.google.com with ESMTPSA id jf10sm14720lac.26.2014.07.16.15.45.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jul 2014 15:45:15 -0700 (PDT) From: Tom Gundersen To: netdev@vger.kernel.org Cc: David Miller , linux-kernel@vger.kernel.org, Tom Gundersen , Dmitry Eremin-Solenikov , linux-zigbee-devel@lists.sourceforge.net Subject: [PATCH v8] net: nl802154 - make add_iface take name assign type Date: Thu, 17 Jul 2014 00:43:13 +0200 Message-Id: <1405550594-11786-6-git-send-email-teg@jklm.no> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1405550594-11786-1-git-send-email-teg@jklm.no> References: <1405550594-11786-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 Acked-by: Alexander Aring Cc: Dmitry Eremin-Solenikov Cc: linux-zigbee-devel@lists.sourceforge.net --- This patch goes on top of net-next. 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 972baf8..5e1a28e 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 b36b2b9..cee12b2 100644 --- a/net/mac802154/ieee802154_dev.c +++ b/net/mac802154/ieee802154_dev.c @@ -159,7 +159,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; @@ -167,12 +168,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: