4 files changed, 12 insertions, 8 deletions

diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 73e314e33de2..506cfa06b184 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -21,6 +21,7 @@
 #include <linux/wireless.h>
 #include <linux/rtnetlink.h>
 #include <linux/bitmap.h>
+#include <net/net_namespace.h>
 #include <net/cfg80211.h>
 
 #include "ieee80211_common.h"
diff --git a/net/mac80211/ieee80211_cfg.c b/net/mac80211/ieee80211_cfg.c
index 509096edb324..b1c13bc9c3ca 100644
--- a/net/mac80211/ieee80211_cfg.c
+++ b/net/mac80211/ieee80211_cfg.c
@@ -8,6 +8,7 @@
 
 #include <linux/nl80211.h>
 #include <linux/rtnetlink.h>
+#include <net/net_namespace.h>
 #include <net/cfg80211.h>
 #include "ieee80211_i.h"
 #include "ieee80211_cfg.h"
@@ -50,7 +51,7 @@ static int ieee80211_del_iface(struct wiphy *wiphy, int ifindex)
         if (unlikely(local->reg_state != IEEE80211_DEV_REGISTERED))
                 return -ENODEV;
 
-        dev = dev_get_by_index(ifindex);
+        dev = dev_get_by_index(&init_net, ifindex);
         if (!dev)
                 return 0;
 
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index b65ff6536244..9e952e37b7df 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -17,6 +17,7 @@
 #include <linux/skbuff.h>
 #include <linux/etherdevice.h>
 #include <linux/bitmap.h>
+#include <net/net_namespace.h>
 #include <net/ieee80211_radiotap.h>
 #include <net/cfg80211.h>
 #include <net/mac80211.h>
@@ -1018,7 +1019,7 @@ static int inline ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
         struct net_device *dev;
 
         pkt_data = (struct ieee80211_tx_packet_data *)skb->cb;
-        dev = dev_get_by_index(pkt_data->ifindex);
+        dev = dev_get_by_index(&init_net, pkt_data->ifindex);
         if (unlikely(dev && !is_ieee80211_device(dev, mdev))) {
                 dev_put(dev);
                 dev = NULL;
@@ -1226,7 +1227,7 @@ int ieee80211_master_start_xmit(struct sk_buff *skb,
         memset(&control, 0, sizeof(struct ieee80211_tx_control));
 
         if (pkt_data->ifindex)
-                odev = dev_get_by_index(pkt_data->ifindex);
+                odev = dev_get_by_index(&init_net, pkt_data->ifindex);
         if (unlikely(odev && !is_ieee80211_device(odev, dev))) {
                 dev_put(odev);
                 odev = NULL;
@@ -1722,7 +1723,7 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, int if_id,
         u8 *b_head, *b_tail;
         int bh_len, bt_len;
 
-        bdev = dev_get_by_index(if_id);
+        bdev = dev_get_by_index(&init_net, if_id);
         if (bdev) {
                 sdata = IEEE80211_DEV_TO_SUB_IF(bdev);
                 ap = &sdata->u.ap;
@@ -1836,7 +1837,7 @@ ieee80211_get_buffered_bc(struct ieee80211_hw *hw, int if_id,
         struct ieee80211_sub_if_data *sdata;
         struct ieee80211_if_ap *bss = NULL;
 
-        bdev = dev_get_by_index(if_id);
+        bdev = dev_get_by_index(&init_net, if_id);
         if (bdev) {
                 sdata = IEEE80211_DEV_TO_SUB_IF(bdev);
                 bss = &sdata->u.ap;
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 07686bda26cd..c970996ba6f9 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -20,6 +20,7 @@
 #include <linux/if_arp.h>
 #include <linux/wireless.h>
 #include <linux/bitmap.h>
+#include <net/net_namespace.h>
 #include <net/cfg80211.h>
 
 #include "ieee80211_i.h"
@@ -318,7 +319,7 @@ __le16 ieee80211_generic_frame_duration(struct ieee80211_hw *hw, int if_id,
                                         size_t frame_len, int rate)
 {
         struct ieee80211_local *local = hw_to_local(hw);
-        struct net_device *bdev = dev_get_by_index(if_id);
+        struct net_device *bdev = dev_get_by_index(&init_net, if_id);
         struct ieee80211_sub_if_data *sdata;
         u16 dur;
         int erp;
@@ -342,7 +343,7 @@ __le16 ieee80211_rts_duration(struct ieee80211_hw *hw, int if_id,
 {
         struct ieee80211_local *local = hw_to_local(hw);
         struct ieee80211_rate *rate;
-        struct net_device *bdev = dev_get_by_index(if_id);
+        struct net_device *bdev = dev_get_by_index(&init_net, if_id);
         struct ieee80211_sub_if_data *sdata;
         int short_preamble;
         int erp;
@@ -378,7 +379,7 @@ __le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw, int if_id,
 {
         struct ieee80211_local *local = hw_to_local(hw);
         struct ieee80211_rate *rate;
-        struct net_device *bdev = dev_get_by_index(if_id);
+        struct net_device *bdev = dev_get_by_index(&init_net, if_id);
         struct ieee80211_sub_if_data *sdata;
         int short_preamble;
         int erp;