From: Eliad Peller Date: Sun, 14 Aug 2011 10:17:31 +0000 (+0300) Subject: wl12xx: don't remove key if hlid was already deleted X-Git-Tag: upstream/snapshot3+hdmi~8889^2~254^2~208^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=010d3d30a218fba961bd3d250a59b0ce9d5278f3;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git wl12xx: don't remove key if hlid was already deleted When wep key was removed after disconnection, sta_hlid was invalid, and it resulted in a fw crash. Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho --- diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 360e33e..c917f69 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c @@ -2625,6 +2625,11 @@ static int wl1271_set_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type, if (action == KEY_REMOVE && !is_broadcast_ether_addr(addr)) return 0; + /* don't remove key if hlid was already deleted */ + if (action == KEY_REMOVE && + wl->sta_hlid == WL12XX_INVALID_LINK_ID) + return 0; + ret = wl1271_cmd_set_sta_key(wl, action, id, key_type, key_size, key, addr, tx_seq_32,