diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 559d698369c71c0f4625317325a24c21506c28bd..0cb29df09e357a30b239594b73b9d058f17f09a1 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 3234f3751d22a1a895d815f89078e7810871ceb1..02cabbffc19a5249321b9db63705cb27f687a14b 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 */