summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-02-11 20:27:30 +0100
committerJohn W. Linville <linville@tuxdriver.com>2009-02-27 14:51:39 -0500
commit076ae609d20901b5fd9bc19fc4c245624c423970 (patch)
tree5d57012f770ea8cf7493b6db3027f60490412f0c
parent53d6f81c7814690ba096584c733e5deaa34fdd8a (diff)
downloadblackbird-op-linux-076ae609d20901b5fd9bc19fc4c245624c423970.tar.gz
blackbird-op-linux-076ae609d20901b5fd9bc19fc4c245624c423970.zip
mac80211: disallow moving netns
mac80211 currently assumes init_net for all interfaces, so really will not cope well with network namespaces, at least at this time. To change this, we would have keep track of the netns in addition to the ifindex, which is not something I want to think about right now. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Cc: Eric W. Biederman <ebiederm@xmission.com> 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 df94b9365264..e8221180b6c1 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -798,6 +798,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
memcpy(ndev->dev_addr, local->hw.wiphy->perm_addr, ETH_ALEN);
SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy));
+ ndev->features |= NETIF_F_NETNS_LOCAL;
/* don't use IEEE80211_DEV_TO_SUB_IF because it checks too much */
sdata = netdev_priv(ndev);
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 5667f4e8067f..795f8c4a9fa0 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -916,6 +916,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
memcpy(local->mdev->dev_addr, local->hw.wiphy->perm_addr, ETH_ALEN);
SET_NETDEV_DEV(local->mdev, wiphy_dev(local->hw.wiphy));
+ local->mdev->features |= NETIF_F_NETNS_LOCAL;
result = register_netdevice(local->mdev);
if (result < 0)
OpenPOWER on IntegriCloud