From: Eliad Peller Date: Sun, 14 Aug 2011 10:17:24 +0000 (+0300) Subject: wl12xx: don't remove key if hlid was already deleted X-Git-Tag: firefly_0821_release~3680^2~4273^2~254^2~208^2~15 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b42f068baab96a899bb5488ad9f0e72b14743ec5;p=firefly-linux-kernel-4.4.55.git wl12xx: don't remove key if hlid was already deleted If hlid was already removed, there is no need to remove its key (it might cause a fw crash, as the key is invalid). Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho --- diff --git a/drivers/net/wireless/wl12xx/cmd.c b/drivers/net/wireless/wl12xx/cmd.c index d655e629677c..261807b45ab5 100644 --- a/drivers/net/wireless/wl12xx/cmd.c +++ b/drivers/net/wireless/wl12xx/cmd.c @@ -1203,6 +1203,10 @@ int wl1271_cmd_set_sta_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type, struct wl1271_cmd_set_keys *cmd; int ret = 0; + /* hlid might have already been deleted */ + if (wl->sta_hlid == WL12XX_INVALID_LINK_ID) + return 0; + cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); if (!cmd) { ret = -ENOMEM;