From 0b6e688de2745b36c6b3fb54d3c4fc1bfb49f9c1 Mon Sep 17 00:00:00 2001 From: Eliad Peller Date: Sun, 14 Aug 2011 13:17:31 +0300 Subject: [PATCH] --- yaml --- r: 265813 b: refs/heads/master c: 010d3d30a218fba961bd3d250a59b0ce9d5278f3 h: refs/heads/master i: 265811: 67ff874534af3a069cdd0e6ce7c99ea81492c1e0 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/main.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 97779b9f6484..40ab55b7fbc9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f97b487c4a9634afc008a76ff26268147d7ee8e +refs/heads/master: 010d3d30a218fba961bd3d250a59b0ce9d5278f3 diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c index 360e33ed3ddb..c917f69f0069 100644 --- a/trunk/drivers/net/wireless/wl12xx/main.c +++ b/trunk/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,