summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2014-11-09 08:36:49 +0100
committerMarcel Holtmann <marcel@holtmann.org>2014-11-09 19:50:28 +0100
commit190ac1ca33442dc25a172ece0f34746a7e1514f3 (patch)
treeea959f364853e6d885c6abbd591d6ea2366058fb
parentf3ada640c25f2d57beef79b7b98619748be3f3ca (diff)
ieee802154: add iftype to wpan_dev
This patch adds an iftype argument to the wpan_dev. This is needed to get the interface type from netdev ieee802154_ptr. The subif data struct can only accessible in mac802154 branch. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--include/net/cfg802154.h1
-rw-r--r--net/mac802154/iface.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/include/net/cfg802154.h b/include/net/cfg802154.h
index 72c4723a1206..7e1bc21423b0 100644
--- a/include/net/cfg802154.h
+++ b/include/net/cfg802154.h
@@ -64,6 +64,7 @@ struct wpan_phy {
struct wpan_dev {
struct wpan_phy *wpan_phy;
+ int iftype;
/* MAC PIB */
__le16 pan_id;
diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c
index c0b96cf525d6..4630ceb25ad2 100644
--- a/net/mac802154/iface.c
+++ b/net/mac802154/iface.c
@@ -404,6 +404,7 @@ ieee802154_setup_sdata(struct ieee802154_sub_if_data *sdata, int type)
/* set some type-dependent values */
sdata->vif.type = type;
+ sdata->wpan_dev.iftype = type;
get_random_bytes(&wpan_dev->bsn, 1);
get_random_bytes(&wpan_dev->dsn, 1);