From 81d67c82e8d618b22fe61446bfacbfd34c95ac5e Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 7 Jan 2010 19:15:30 +0000 Subject: 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 --- .../patches/550-mac80211_action_frame_fix.patch | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/mac80211/patches/550-mac80211_action_frame_fix.patch 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 000000000..9283af64a --- /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; + } + -- cgit v1.2.3