summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-07-14 00:33:36 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-07-27 15:24:08 -0400
commita272a720660059c30fa038113b77fa2a096437d9 (patch)
tree57da6a50b0a9a0d68fafe98f621fff15a2b8bd94
parent463d018323851a608eef52a9427b0585005c647f (diff)
downloadblackbird-op-linux-a272a720660059c30fa038113b77fa2a096437d9.tar.gz
blackbird-op-linux-a272a720660059c30fa038113b77fa2a096437d9.zip
mac80211: allow using network namespaces
This finally opens up the ability to put mac80211 devices into different network namespaces. As long as you don't have sysfs, that is. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/mac80211/iface.c1
-rw-r--r--net/mac80211/main.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 559d698369c7..0cb29df09e35 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -787,6 +787,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
name, ieee80211_if_setup);
if (!ndev)
return -ENOMEM;
+ dev_net_set(ndev, wiphy_net(local->hw.wiphy));
ndev->needed_headroom = local->tx_headroom +
4*6 /* four MAC addresses */
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 3234f3751d22..02cabbffc19a 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -620,6 +620,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
if (!wiphy)
return NULL;
+ wiphy->netnsok = true;
wiphy->privid = mac80211_wiphy_privid;
/* Yes, putting cfg80211_bss into ieee80211_bss is a hack */
OpenPOWER on IntegriCloud