diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 559d698..0cb29df 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -787,6 +787,7 @@
 			    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 3234f37..02cabbf 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -620,6 +620,7 @@
 	if (!wiphy)
 		return NULL;
 
+	wiphy->netnsok = true;
 	wiphy->privid = mac80211_wiphy_privid;
 
 	/* Yes, putting cfg80211_bss into ieee80211_bss is a hack */