summaryrefslogtreecommitdiffstats
path: root/package/mac80211
diff options
context:
space:
mode:
authoracoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-07-31 06:21:13 +0000
committeracoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-07-31 06:21:13 +0000
commitbb5ab3b0e0e49f16f9a9d480ebfb6c9658c3d1f7 (patch)
treecfc8fd8284582c39c822cb462be158200189bffd /package/mac80211
parent5b072cdd2d92c6bafcdc023177edcd56de84ace1 (diff)
package/mac80211: sync commit r22419
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22422 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211')
-rw-r--r--package/mac80211/patches/524-mac80211_offchannel_fix.patch27
1 files changed, 0 insertions, 27 deletions
diff --git a/package/mac80211/patches/524-mac80211_offchannel_fix.patch b/package/mac80211/patches/524-mac80211_offchannel_fix.patch
deleted file mode 100644
index ce594b019..000000000
--- a/package/mac80211/patches/524-mac80211_offchannel_fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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;