aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/cfg80211.h2
-rw-r--r--net/wireless/ibss.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index c62bc7864adf..e030c6af86dd 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -2411,6 +2411,8 @@ struct wireless_dev {
2411 /* for AP and mesh channel tracking */ 2411 /* for AP and mesh channel tracking */
2412 struct ieee80211_channel *channel; 2412 struct ieee80211_channel *channel;
2413 2413
2414 bool ibss_fixed;
2415
2414 bool ps; 2416 bool ps;
2415 int ps_timeout; 2417 int ps_timeout;
2416 2418
diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c
index 89baa3328411..b90fd86b2d18 100644
--- a/net/wireless/ibss.c
+++ b/net/wireless/ibss.c
@@ -113,6 +113,7 @@ int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev,
113 kfree(wdev->connect_keys); 113 kfree(wdev->connect_keys);
114 wdev->connect_keys = connkeys; 114 wdev->connect_keys = connkeys;
115 115
116 wdev->ibss_fixed = params->channel_fixed;
116#ifdef CONFIG_CFG80211_WEXT 117#ifdef CONFIG_CFG80211_WEXT
117 wdev->wext.ibss.channel = params->channel; 118 wdev->wext.ibss.channel = params->channel;
118#endif 119#endif