wl12xx: leave IV calculation to HW for CCMP
authorArik Nemtsov <arik@wizery.com>
Sun, 23 Oct 2011 06:21:54 +0000 (08:21 +0200)
committerLuciano Coelho <coelho@ti.com>
Thu, 1 Dec 2011 13:56:13 +0000 (15:56 +0200)
Use an appropriate mac80211 flags in CCMP keys to indicate we are
calculating the CCMP IV in HW, but require room for the IV to be reserved
in the skb. The space is reserved by mac80211.

depends on "mac80211: support adding IV-room in the skb for CCMP keys".

Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
drivers/net/wireless/wl12xx/main.c

index 8ff1bf5be0134db9594cc418b9d560aa29e537db..d1416752feeaf5f18607ee5460b18e74c244564a 100644 (file)
@@ -2986,7 +2986,7 @@ static int wl1271_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
        case WLAN_CIPHER_SUITE_CCMP:
                key_type = KEY_AES;
 
-               key_conf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
+               key_conf->flags |= IEEE80211_KEY_FLAG_PUT_IV_SPACE;
                tx_seq_32 = WL1271_TX_SECURITY_HI32(wlvif->tx_security_seq);
                tx_seq_16 = WL1271_TX_SECURITY_LO16(wlvif->tx_security_seq);
                break;