3 files changed, 10 insertions, 8 deletions

diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h
index 748dc5afe367..931f8516cee6 100644
--- a/net/mac802154/ieee802154_i.h
+++ b/net/mac802154/ieee802154_i.h
@@ -79,7 +79,6 @@ struct ieee802154_sub_if_data {
         struct ieee802154_local *local;
         struct net_device *dev;
 
-        int type;
         unsigned long state;
         char name[IFNAMSIZ];
 
@@ -103,6 +102,8 @@ struct ieee802154_sub_if_data {
         struct mutex sec_mtx;
 
         struct mac802154_llsec sec;
+        /* must be last, dynamically sized area in this! */
+        struct ieee802154_vif vif;
 };
 
 #define MAC802154_CHAN_NONE             0xff /* No channel is assigned */
diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c
index 2e2638e72ae8..764ce496fdc3 100644
--- a/net/mac802154/iface.c
+++ b/net/mac802154/iface.c
@@ -136,10 +136,11 @@ static int mac802154_slave_open(struct net_device *dev)
 
         ASSERT_RTNL();
 
-        if (sdata->type == IEEE802154_DEV_WPAN) {
+        if (sdata->vif.type == IEEE802154_DEV_WPAN) {
                 mutex_lock(&sdata->local->iflist_mtx);
                 list_for_each_entry(subif, &sdata->local->interfaces, list) {
-                        if (subif != sdata && subif->type == sdata->type &&
+                        if (subif != sdata &&
+                            subif->vif.type == sdata->vif.type &&
                             ieee802154_sdata_running(subif)) {
                                 mutex_unlock(&sdata->local->iflist_mtx);
                                 return -EBUSY;
@@ -397,7 +398,7 @@ static int
 ieee802154_setup_sdata(struct ieee802154_sub_if_data *sdata, int type)
 {
         /* set some type-dependent values */
-        sdata->type = type;
+        sdata->vif.type = type;
 
         get_random_bytes(&sdata->bsn, 1);
         get_random_bytes(&sdata->dsn, 1);
@@ -447,8 +448,8 @@ ieee802154_if_add(struct ieee802154_local *local, const char *name,
 
         ASSERT_RTNL();
 
-        ndev = alloc_netdev(sizeof(*sdata), name, NET_NAME_UNKNOWN,
-                            ieee802154_if_setup);
+        ndev = alloc_netdev(sizeof(*sdata) + local->hw.vif_data_size, name,
+                            NET_NAME_UNKNOWN, ieee802154_if_setup);
         if (!ndev)
                 return ERR_PTR(-ENOMEM);
 
diff --git a/net/mac802154/rx.c b/net/mac802154/rx.c
index 95961cccc253..4b54cf33e562 100644
--- a/net/mac802154/rx.c
+++ b/net/mac802154/rx.c
@@ -208,7 +208,7 @@ __ieee802154_rx_handle_packet(struct ieee802154_local *local,
         }
 
         list_for_each_entry_rcu(sdata, &local->interfaces, list) {
-                if (sdata->type != IEEE802154_DEV_WPAN ||
+                if (sdata->vif.type != IEEE802154_DEV_WPAN ||
                     !netif_running(sdata->dev))
                         continue;
 
@@ -233,7 +233,7 @@ ieee802154_monitors_rx(struct ieee802154_local *local, struct sk_buff *skb)
         skb->protocol = htons(ETH_P_IEEE802154);
 
         list_for_each_entry_rcu(sdata, &local->interfaces, list) {
-                if (sdata->type != IEEE802154_DEV_MONITOR)
+                if (sdata->vif.type != IEEE802154_DEV_MONITOR)
                         continue;
 
                 if (!ieee802154_sdata_running(sdata))