aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-07-31 06:21:13 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-07-31 06:21:13 +0000
commit524779230e795437606f65f8cf494d483d6cf8ca (patch)
tree61b6926acbbe4957ba09d0b9d4ab5e8c3385cc5f /package/mac80211
parenteea5f1c56506b2be40def4f5e435fa4c528a62f4 (diff)
downloadupstream-524779230e795437606f65f8cf494d483d6cf8ca.tar.gz
upstream-524779230e795437606f65f8cf494d483d6cf8ca.tar.bz2
upstream-524779230e795437606f65f8cf494d483d6cf8ca.zip
package/mac80211: sync commit r22419
SVN-Revision: 22422
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 ce594b0197..0000000000
--- 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;