From patchwork Wed May 16 06:50:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alex.bluesman.smirnov@gmail.com X-Patchwork-Id: 159531 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 94BBFB6FC8 for ; Wed, 16 May 2012 16:52:39 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759425Ab2EPGwa (ORCPT ); Wed, 16 May 2012 02:52:30 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:39855 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759391Ab2EPGvr (ORCPT ); Wed, 16 May 2012 02:51:47 -0400 Received: by mail-we0-f174.google.com with SMTP id u7so224313wey.19 for ; Tue, 15 May 2012 23:51:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=yECxt8fokbahg9/l0thkC4EIcMSx78SRA1AbDLmNIyc=; b=Ul+H8zIxx8RHexPp6jZg3c1vJMNz/t03LEJnqbOxFUXqZCEB3dSeSu8J1UlaFV5IFH 86vuddjrwpynKiwmWQMjVXA+ZqdWZTj0PDd5eFVXtDrF8W4e0xhh7xhSzSRz8tBetzZW WDJQyQAymTtGGCVDDz3Szimg4IQEkADfm1/drHYk/fD+v8xh2QKjLXReJNd7wbYJVsMa 3uAe6t+HkWEczo8FXgflBcrCsatzPSvWwfhGtUMrUfi9OghU9nmYaRhosFlZ1d+cjoxb hP1lUVWCSMw2iaFtZWGRUixbmiAEOHC7FIfAyEWBiwZwzNP4ewOA2X3WUJT8q5Pbpx8B w3oA== Received: by 10.180.74.193 with SMTP id w1mr4942703wiv.4.1337151106702; Tue, 15 May 2012 23:51:46 -0700 (PDT) Received: from localhost.localdomain ([91.213.169.4]) by mx.google.com with ESMTPS id e6sm47694359wix.8.2012.05.15.23.51.45 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 15 May 2012 23:51:46 -0700 (PDT) From: Alexander Smirnov To: davem@davemloft.net Cc: netdev@vger.kernel.org, dbaryshkov@gmail.com, Alexander Smirnov Subject: [PATCH net-next v5 09/13] ieee802154: interface type to be added Date: Wed, 16 May 2012 10:50:27 +0400 Message-Id: <1337151031-5178-10-git-send-email-alex.bluesman.smirnov@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1337151031-5178-1-git-send-email-alex.bluesman.smirnov@gmail.com> References: <1337151031-5178-1-git-send-email-alex.bluesman.smirnov@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This stack implementation distinguishes several types of slave interfaces. Another parameter to 'add_iface_' function is added to clarify the interface type is going to be registered. Signed-off-by: Alexander Smirnov --- include/linux/nl802154.h | 6 ++++++ include/net/wpan-phy.h | 2 +- net/ieee802154/nl-phy.c | 9 ++++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/include/linux/nl802154.h b/include/linux/nl802154.h index 33d9f51..2015ad2 100644 --- a/include/linux/nl802154.h +++ b/include/linux/nl802154.h @@ -68,6 +68,7 @@ enum { IEEE802154_ATTR_CHANNEL_PAGE_LIST, IEEE802154_ATTR_PHY_NAME, + IEEE802154_ATTR_DEV_TYPE, __IEEE802154_ATTR_MAX, }; @@ -126,4 +127,9 @@ enum { #define IEEE802154_CMD_MAX (__IEEE802154_CMD_MAX - 1) +enum { + __IEEE802154_DEV_INVALID = -1, + __IEEE802154_DEV_MAX, +}; + #endif diff --git a/include/net/wpan-phy.h b/include/net/wpan-phy.h index ff27f1b..efd6749 100644 --- a/include/net/wpan-phy.h +++ b/include/net/wpan-phy.h @@ -43,7 +43,7 @@ struct wpan_phy { int idx; struct net_device *(*add_iface)(struct wpan_phy *phy, - const char *name); + const char *name, int type); void (*del_iface)(struct wpan_phy *phy, struct net_device *dev); char priv[0] __attribute__((__aligned__(NETDEV_ALIGN))); diff --git a/net/ieee802154/nl-phy.c b/net/ieee802154/nl-phy.c index 3bdc430..eed2916 100644 --- a/net/ieee802154/nl-phy.c +++ b/net/ieee802154/nl-phy.c @@ -179,6 +179,7 @@ static int ieee802154_add_iface(struct sk_buff *skb, const char *devname; int rc = -ENOBUFS; struct net_device *dev; + int type = __IEEE802154_DEV_INVALID; pr_debug("%s\n", __func__); @@ -221,7 +222,13 @@ static int ieee802154_add_iface(struct sk_buff *skb, goto nla_put_failure; } - dev = phy->add_iface(phy, devname); + if (info->attrs[IEEE802154_ATTR_DEV_TYPE]) { + type = nla_get_u8(info->attrs[IEEE802154_ATTR_DEV_TYPE]); + if (type >= __IEEE802154_DEV_MAX) + return -EINVAL; + } + + dev = phy->add_iface(phy, devname, type); if (IS_ERR(dev)) { rc = PTR_ERR(dev); goto nla_put_failure;