cfg80211: track ibss fixed channel

IBSS may hop between channels. It is necessary to
account this special case when considering
interface combinations.

Signed-off-by: Michal Kazior <[email protected]>
Signed-off-by: Johannes Berg <[email protected]>

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index c62bc7864adfd839d5175bc7fc232209895431bf..e030c6af86dd07a5c1bd08551bdf34b28aba1544 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -2411,6 +2411,8 @@ struct wireless_dev {
        /* for AP and mesh channel tracking */
        struct ieee80211_channel *channel;
 
+       bool ibss_fixed;
+
        bool ps;
        int ps_timeout;
 

diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c
index 89baa3328411485ac4748aa9e0f9d097fdd30a97..b90fd86b2d1890fa494bea918195b000f5d1f0dd 100644 (file)
--- a/net/wireless/ibss.c
+++ b/net/wireless/ibss.c
@@ -113,6 +113,7 @@ int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev,
                kfree(wdev->connect_keys);
        wdev->connect_keys = connkeys;
 
+       wdev->ibss_fixed = params->channel_fixed;
 #ifdef CONFIG_CFG80211_WEXT
        wdev->wext.ibss.channel = params->channel;
 #endif