From: Malcolm Priestley Date: Wed, 29 Apr 2020 18:44:29 +0000 (+0100) Subject: staging: vt6656 remove vnt_mac_disable_keyentry calls X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ddaa877f2dbc88d8109ceaf4b94b5372173a4bf4;p=linux.git staging: vt6656 remove vnt_mac_disable_keyentry calls It is not necessary to disable all the keys mac80211 will have removed any existing keys that were used. Signed-off-by: Malcolm Priestley Link: https://lore.kernel.org/r/844df68d-08e2-7672-524f-42b918e300c1@gmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6656/key.c b/drivers/staging/vt6656/key.c index 47338077c033b..de54cc3ff95a8 100644 --- a/drivers/staging/vt6656/key.c +++ b/drivers/staging/vt6656/key.c @@ -102,22 +102,14 @@ int vnt_set_keys(struct ieee80211_hw *hw, struct ieee80211_sta *sta, struct vnt_private *priv = hw->priv; u8 *mac_addr = NULL; u8 key_dec_mode = 0; - int ret = 0, u; + int ret = 0; if (sta) mac_addr = &sta->addr[0]; switch (key->cipher) { - case 0: - for (u = 0 ; u < MAX_KEY_TABLE; u++) - vnt_mac_disable_keyentry(priv, u); - return ret; - case WLAN_CIPHER_SUITE_WEP40: case WLAN_CIPHER_SUITE_WEP104: - for (u = 0; u < MAX_KEY_TABLE; u++) - vnt_mac_disable_keyentry(priv, u); - vnt_set_keymode(hw, mac_addr, key, VNT_KEY_DEFAULTKEY, KEY_CTL_WEP);