aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSenthil Balasubramanian <senthilkumar@atheros.com>2010-11-30 09:45:38 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-11-30 13:45:02 -0500
commit8e26d5ad2f9c038609d42eebc676cd1107709eef (patch)
tree64faf31c3f8dcc4000b06c21a6df147f2f522d18 /net
parent2c31333a8fde7e26936a9f5371d02ff12c490993 (diff)
mac80211: Fix STA disconnect due to MIC failure
Th commit titled "mac80211: clean up rx handling wrt. found_sta" removed found_sta variable which caused a MIC failure event to be reported twice for a single failure to supplicant resulted in STA disconnect. This should fix WPA specific countermeasures WiFi test case (5.2.17) issues with mac80211 based drivers which report MIC failure events in rx status. Cc: Stable <stable@kernel.org> (2.6.37) Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/rx.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 3c87293cb078..54fb4a0e76f0 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2745,6 +2745,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
2745 2745
2746 if (ieee80211_prepare_and_rx_handle(&rx, skb, true)) 2746 if (ieee80211_prepare_and_rx_handle(&rx, skb, true))
2747 return; 2747 return;
2748 goto out;
2748 } 2749 }
2749 } 2750 }
2750 2751
@@ -2784,6 +2785,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
2784 return; 2785 return;
2785 } 2786 }
2786 2787
2788 out:
2787 dev_kfree_skb(skb); 2789 dev_kfree_skb(skb);
2788} 2790}
2789 2791