diff options
| author | Alexander Aring <alex.aring@gmail.com> | 2014-11-05 20:51:17 +0100 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-11-05 21:53:04 +0100 |
| commit | d5ae67bacd9654b0e26b9f248249e9ee1b6e338b (patch) | |
| tree | 7462206b0153d069ab4421a0d9d299c419d3b56e /net/mac802154/ieee802154_i.h | |
| parent | mac802154: move dev_hold out of ieee802154_if_add (diff) | |
| download | linux-d5ae67bacd9654b0e26b9f248249e9ee1b6e338b.tar.xz linux-d5ae67bacd9654b0e26b9f248249e9ee1b6e338b.zip | |
ieee802154: rework interface registration
This patch meld mac802154_netdev_register into ieee802154_if_add
function. Also we have now only one alloc_netdev call with one interface
setup routine "ieee802154_if_setup" instead two different one for each
interface type. This patch checks via runtime the interface type and do
different handling now. Additional we add the wpan_dev struct in
ieee802154_sub_if_data and set the new ieee802154_ptr while netdev
registration. This behaviour is very similar the mac80211 netdev
registration functionality.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/mac802154/ieee802154_i.h')
| -rw-r--r-- | net/mac802154/ieee802154_i.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h index 3ad85404fc94..748dc5afe367 100644 --- a/net/mac802154/ieee802154_i.h +++ b/net/mac802154/ieee802154_i.h @@ -20,6 +20,7 @@ #define __IEEE802154_I_H #include <linux/mutex.h> +#include <net/cfg802154.h> #include <net/mac802154.h> #include <net/ieee802154_netdev.h> @@ -73,11 +74,14 @@ enum ieee802154_sdata_state_bits { struct ieee802154_sub_if_data { struct list_head list; /* the ieee802154_priv->slaves list */ + struct wpan_dev wpan_dev; + struct ieee802154_local *local; struct net_device *dev; int type; unsigned long state; + char name[IFNAMSIZ]; spinlock_t mib_lock; |