From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 12 Jul 2012 14:10:02 +0000 (+0200)
Subject: cfg80211: ignore channel state for stopped AP/mesh interfaces
X-Git-Tag: firefly_0821_release~3680^2~2381^2~57^2~1^2~18
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f53594a0d8f4b9d7bc3d3ed8062b9c428f5447a3;p=firefly-linux-kernel-4.4.55.git

cfg80211: ignore channel state for stopped AP/mesh interfaces

Without this change, running AP + station on the same wiphy
does not work since the commit "cfg80211: add channel checking
for iface combinations". The stopped AP prevents the client
from connecting to an AP on a different channel.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
[line-break commit message to < 72 chars]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/wireless/chan.c b/net/wireless/chan.c
index 1cc4b7cc7372..a16cdffb24a9 100644
--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
@@ -134,9 +134,16 @@ cfg80211_get_chan_state(struct wireless_dev *wdev,
 		break;
 	case NL80211_IFTYPE_AP:
 	case NL80211_IFTYPE_P2P_GO:
+		if (wdev->beacon_interval) {
+			*chan = wdev->channel;
+			*chanmode = CHAN_MODE_SHARED;
+		}
+		return;
 	case NL80211_IFTYPE_MESH_POINT:
-		*chan = wdev->channel;
-		*chanmode = CHAN_MODE_SHARED;
+		if (wdev->mesh_id_len) {
+			*chan = wdev->channel;
+			*chanmode = CHAN_MODE_SHARED;
+		}
 		return;
 	case NL80211_IFTYPE_MONITOR:
 	case NL80211_IFTYPE_AP_VLAN: