aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-01-07 19:15:30 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-01-07 19:15:30 +0000
commitcfc041afc1ac137d0ea2141d0ced8b063457f096 (patch)
tree9bcbb57e360ab9f7d20e1467313770df7c8cde0e
parenta2c0f039a9d32bbb9c8b4a472fafbf3cb7f8ca0f (diff)
downloadupstream-cfc041afc1ac137d0ea2141d0ced8b063457f096.tar.gz
upstream-cfc041afc1ac137d0ea2141d0ced8b063457f096.tar.bz2
upstream-cfc041afc1ac137d0ea2141d0ced8b063457f096.zip
mac80211: fix spurious client reconnects triggered by rejected action frames being interpreted as chan switch announcements
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19064 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/550-mac80211_action_frame_fix.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/package/mac80211/patches/550-mac80211_action_frame_fix.patch b/package/mac80211/patches/550-mac80211_action_frame_fix.patch
new file mode 100644
index 0000000000..9283af64a7
--- /dev/null
+++ b/package/mac80211/patches/550-mac80211_action_frame_fix.patch
@@ -0,0 +1,26 @@
+--- a/net/mac80211/mlme.c
++++ b/net/mac80211/mlme.c
+@@ -1451,7 +1451,9 @@ static void ieee80211_sta_rx_queued_mgmt
+ rma = ieee80211_rx_mgmt_disassoc(sdata, mgmt, skb->len);
+ break;
+ case IEEE80211_STYPE_ACTION:
+- /* XXX: differentiate, can only happen for CSA now! */
++ if (mgmt->u.action.category != WLAN_CATEGORY_SPECTRUM_MGMT)
++ break;
++
+ ieee80211_sta_process_chanswitch(sdata,
+ &mgmt->u.action.u.chan_switch.sw_elem,
+ (void *)ifmgd->associated->priv);
+--- a/net/mac80211/rx.c
++++ b/net/mac80211/rx.c
+@@ -1934,6 +1934,10 @@ ieee80211_rx_h_action(struct ieee80211_r
+ }
+ break;
+ default:
++ /* do not process rejected action frames */
++ if (mgmt->u.action.category & 0x80)
++ return RX_DROP_MONITOR;
++
+ return RX_CONTINUE;
+ }
+