---

yaml --- r: 315191 b: refs/heads/master c: c30a3d3 h: refs/heads/master i: 315189: eb4a979 315187: 4adef94 315183: 9f3a306 v: v3
git-mirror · Jun 29, 2012 · d2c8f77 · d2c8f77
1 parent 4b003c3
commit d2c8f77
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4489ebeffa436c8427a20e2f05004e783708cde
+refs/heads/master: c30a3d38689bc601e03d5f2ad3c37d8ea13e46ca
diff --git a/trunk/include/net/cfg80211.h b/trunk/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/trunk/net/wireless/ibss.c b/trunk/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