[PATCH] Fixed BSSID step 5: Allow to set channel in adhoc properly

[PATCH] Fixed BSSID step 5: Allow to set channel in adhoc properly

[Alina Friedrichsen]

[-- Attachment #1: Type: text/plain, Size: 1357 bytes --]

The last patch fixes a bug that it was not possible to set the channel manually in the ad hoc mode properly.

Please commit this patches so that we don't need the proprietary Broadcom driver in the near future anymore.

Signed-off-by: Alina Friedrichsen <x-alina@gmx.net>

diff -urN compat-wireless-2009-01-05.orig/net/mac80211/wext.c compat-wireless-2009-01-05.work/net/mac80211/wext.c
--- compat-wireless-2009-01-05.orig/net/mac80211/wext.c	2009-01-06 02:07:38.000000000 +0100
+++ compat-wireless-2009-01-05/net/mac80211/wext.c	2009-01-06 02:13:21.000000000 +0100
@@ -230,13 +230,15 @@
 {
 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 
-	if (sdata->vif.type == NL80211_IFTYPE_STATION)
+	if (sdata->vif.type == NL80211_IFTYPE_ADHOC ||
+	    sdata->vif.type == NL80211_IFTYPE_STATION)
 		sdata->u.sta.flags &= ~IEEE80211_STA_AUTO_CHANNEL_SEL;
 
 	/* freq->e == 0: freq->m = channel; otherwise freq = m * 10^e */
 	if (freq->e == 0) {
 		if (freq->m < 0) {
-			if (sdata->vif.type == NL80211_IFTYPE_STATION)
+			if (sdata->vif.type == NL80211_IFTYPE_ADHOC ||
+			    sdata->vif.type == NL80211_IFTYPE_STATION)
 				sdata->u.sta.flags |=
 					IEEE80211_STA_AUTO_CHANNEL_SEL;
 			return 0;

-- 
Sensationsangebot verlängert: GMX FreeDSL - Telefonanschluss + DSL 
für nur 16,37 Euro/mtl.!* http://dsl.gmx.de/?ac=OM.AD.PD003K1308T4569a

[-- Attachment #2: step5-allow-to-set-channel-in-adhoc-properly.patch --]
[-- Type: text/x-patch, Size: 940 bytes --]

diff -urN compat-wireless-2009-01-05.orig/net/mac80211/wext.c compat-wireless-2009-01-05.work/net/mac80211/wext.c
--- compat-wireless-2009-01-05.orig/net/mac80211/wext.c	2009-01-06 02:07:38.000000000 +0100
+++ compat-wireless-2009-01-05/net/mac80211/wext.c	2009-01-06 02:13:21.000000000 +0100
@@ -230,13 +230,15 @@
 {
 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 
-	if (sdata->vif.type == NL80211_IFTYPE_STATION)
+	if (sdata->vif.type == NL80211_IFTYPE_ADHOC ||
+	    sdata->vif.type == NL80211_IFTYPE_STATION)
 		sdata->u.sta.flags &= ~IEEE80211_STA_AUTO_CHANNEL_SEL;
 
 	/* freq->e == 0: freq->m = channel; otherwise freq = m * 10^e */
 	if (freq->e == 0) {
 		if (freq->m < 0) {
-			if (sdata->vif.type == NL80211_IFTYPE_STATION)
+			if (sdata->vif.type == NL80211_IFTYPE_ADHOC ||
+			    sdata->vif.type == NL80211_IFTYPE_STATION)
 				sdata->u.sta.flags |=
 					IEEE80211_STA_AUTO_CHANNEL_SEL;
 			return 0;