diff --git a/net/wireless/util.c b/net/wireless/util.c
index e7be500b6452..82bf1339c28e 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -950,6 +950,7 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev,
 
 		switch (otype) {
 		case NL80211_IFTYPE_AP:
+		case NL80211_IFTYPE_P2P_GO:
 			cfg80211_stop_ap(rdev, dev, true);
 			break;
 		case NL80211_IFTYPE_ADHOC: