---

yaml --- r: 159236 b: refs/heads/master c: a272a72 h: refs/heads/master v: v3
git-mirror · Jul 27, 2009 · db68c54 · db68c54
1 parent ef161ba
commit db68c54
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 463d018323851a608eef52a9427b0585005c647f
+refs/heads/master: a272a720660059c30fa038113b77fa2a096437d9
diff --git a/trunk/net/mac80211/iface.c b/trunk/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/trunk/net/mac80211/main.c b/trunk/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 */