aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-07-30 10:52:51 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-07-30 10:52:51 +0000
commitb6623aaf0393b60b02c1de1af524e4f35a2358a4 (patch)
tree62acecaff92210c6ff9f895231be6e585b42b55c
parente71a04cac15b4a8b5c8f1b64e9e53f7dc8951f33 (diff)
downloadmaster-187ad058-b6623aaf0393b60b02c1de1af524e4f35a2358a4.tar.gz
master-187ad058-b6623aaf0393b60b02c1de1af524e4f35a2358a4.tar.bz2
master-187ad058-b6623aaf0393b60b02c1de1af524e4f35a2358a4.zip
mac80211: minor fix for the offchannel status change notification
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22417 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/524-mac80211_offchannel_fix.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/package/mac80211/patches/524-mac80211_offchannel_fix.patch b/package/mac80211/patches/524-mac80211_offchannel_fix.patch
new file mode 100644
index 0000000000..ce594b0197
--- /dev/null
+++ b/package/mac80211/patches/524-mac80211_offchannel_fix.patch
@@ -0,0 +1,27 @@
+--- a/net/mac80211/main.c
++++ b/net/mac80211/main.c
+@@ -99,11 +99,13 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
+ int ret = 0;
+ int power;
+ enum nl80211_channel_type channel_type;
++ u32 offchannel_flag;
+
+ might_sleep();
+
+ scan_chan = local->scan_channel;
+
++ offchannel_flag = local->hw.conf.flags & IEEE80211_CONF_OFFCHANNEL;
+ if (scan_chan) {
+ chan = scan_chan;
+ channel_type = NL80211_CHAN_NO_HT;
+@@ -117,8 +119,9 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
+ channel_type = local->_oper_channel_type;
+ local->hw.conf.flags &= ~IEEE80211_CONF_OFFCHANNEL;
+ }
++ offchannel_flag ^= local->hw.conf.flags & IEEE80211_CONF_OFFCHANNEL;
+
+- if (chan != local->hw.conf.channel ||
++ if (offchannel_flag || chan != local->hw.conf.channel ||
+ channel_type != local->hw.conf.channel_type) {
+ local->hw.conf.channel = chan;
+ local->hw.conf.channel_type = channel_type;