staging: vt6656 remove vnt_mac_disable_keyentry calls
authorMalcolm Priestley <tvboxspy@gmail.com>
Wed, 29 Apr 2020 18:44:29 +0000 (19:44 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 5 May 2020 10:27:59 +0000 (12:27 +0200)
It is not necessary to disable all the keys mac80211 will
have removed any existing keys that were used.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Link: https://lore.kernel.org/r/844df68d-08e2-7672-524f-42b918e300c1@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/key.c

index 4733807..de54cc3 100644 (file)
@@ -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);