aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2014-02-10 06:47:29 -0500
committerJohn W. Linville <linville@tuxdriver.com>2014-02-13 15:20:16 -0500
commitbf4e5f1ac0e2b277424ec0d035b1fbab46dd66bb (patch)
tree6833ef3112eba8c41bbb83d6e06b71f4e7ad2c2b
parentbc566f9203c2813a2e083677eb99c62b1cb14d03 (diff)
wlcore: don't handle unsetting of default wep key
mac80211 unsets the default wep key on disassoc. The fw doesn't support this notification, so simply ignore it. The actual flow actually triggers fw recovery in some cases, as mac80211 unsets the default key only after disassoc, when wlvif->sta.hlid, resulting in invalid hlid being passed to the fw. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ti/wlcore/main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index bea2938ebbc8..d80d40cf7a22 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -3472,6 +3472,10 @@ static void wl1271_op_set_default_key_idx(struct ieee80211_hw *hw,
3472 wl1271_debug(DEBUG_MAC80211, "mac80211 set default key idx %d", 3472 wl1271_debug(DEBUG_MAC80211, "mac80211 set default key idx %d",
3473 key_idx); 3473 key_idx);
3474 3474
3475 /* we don't handle unsetting of default key */
3476 if (key_idx == -1)
3477 return;
3478
3475 mutex_lock(&wl->mutex); 3479 mutex_lock(&wl->mutex);
3476 3480
3477 if (unlikely(wl->state != WLCORE_STATE_ON)) { 3481 if (unlikely(wl->state != WLCORE_STATE_ON)) {