staging: vt6656: Fix pairwise key entry save.

[linux-2.6-block.git] / drivers / staging / vt6656 / key.c

diff --git a/drivers/staging/vt6656/key.c b/drivers/staging/vt6656/key.c
index 41b73f9670e2c82021df995cd5fbbbb609fe1d1b..ac3b188984d0f57db8d6e6a3fe23381bb5077a5f 100644 (file)
--- a/drivers/staging/vt6656/key.c
+++ b/drivers/staging/vt6656/key.c
@@ -83,9 +83,6 @@ static int vnt_set_keymode(struct ieee80211_hw *hw, u8 *mac_addr,
        case  VNT_KEY_PAIRWISE:
                key_mode |= mode;
                key_inx = 4;
-               /* Don't save entry for pairwise key for station mode */
-               if (priv->op_mode == NL80211_IFTYPE_STATION)
-                       clear_bit(entry, &priv->key_entry_inuse);
                break;
        default:
                return -EINVAL;
@@ -109,7 +106,6 @@ static int vnt_set_keymode(struct ieee80211_hw *hw, u8 *mac_addr,
 int vnt_set_keys(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
                 struct ieee80211_vif *vif, struct ieee80211_key_conf *key)
 {
-       struct ieee80211_bss_conf *conf = &vif->bss_conf;
        struct vnt_private *priv = hw->priv;
        u8 *mac_addr = NULL;
        u8 key_dec_mode = 0;
@@ -154,16 +150,12 @@ int vnt_set_keys(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
                return -EOPNOTSUPP;
        }
 
-       if (key->flags & IEEE80211_KEY_FLAG_PAIRWISE) {
+       if (key->flags & IEEE80211_KEY_FLAG_PAIRWISE)
                vnt_set_keymode(hw, mac_addr, key, VNT_KEY_PAIRWISE,
                                key_dec_mode, true);
-       } else {
-               vnt_set_keymode(hw, mac_addr, key, VNT_KEY_DEFAULTKEY,
+       else
+               vnt_set_keymode(hw, mac_addr, key, VNT_KEY_GROUP_ADDRESS,
                                key_dec_mode, true);
 
-               vnt_set_keymode(hw, (u8 *)conf->bssid, key,
-                               VNT_KEY_GROUP_ADDRESS, key_dec_mode, true);
-       }
-
        return 0;
 }