Merge remote-tracking branch 'spi/fix/core' into spi-linus

[firefly-linux-kernel-4.4.55.git] / net / mac80211 / wpa.c

diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c
index 75de6fac40d1533fbb9836ab138d71e838ffb6af..9d63d93c836ebbd6d8396964556e1e0a054e4578 100644 (file)
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
@@ -780,9 +780,8 @@ ieee80211_crypto_cs_encrypt(struct ieee80211_tx_data *tx,
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
        struct ieee80211_key *key = tx->key;
        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-       const struct ieee80211_cipher_scheme *cs = key->sta->cipher_scheme;
        int hdrlen;
-       u8 *pos;
+       u8 *pos, iv_len = key->conf.iv_len;
 
        if (info->control.hw_key &&
            !(info->control.hw_key->flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE)) {
@@ -790,14 +789,14 @@ ieee80211_crypto_cs_encrypt(struct ieee80211_tx_data *tx,
                return TX_CONTINUE;
        }
 
-       if (unlikely(skb_headroom(skb) < cs->hdr_len &&
-                    pskb_expand_head(skb, cs->hdr_len, 0, GFP_ATOMIC)))
+       if (unlikely(skb_headroom(skb) < iv_len &&
+                    pskb_expand_head(skb, iv_len, 0, GFP_ATOMIC)))
                return TX_DROP;
 
        hdrlen = ieee80211_hdrlen(hdr->frame_control);
 
-       pos = skb_push(skb, cs->hdr_len);
-       memmove(pos, pos + cs->hdr_len, hdrlen);
+       pos = skb_push(skb, iv_len);
+       memmove(pos, pos + iv_len, hdrlen);
 
        return TX_CONTINUE;
 }
@@ -1217,7 +1216,7 @@ ieee80211_crypto_hw_encrypt(struct ieee80211_tx_data *tx)
                if (!info->control.hw_key)
                        return TX_DROP;
 
-               if (tx->key->sta->cipher_scheme) {
+               if (tx->key->flags & KEY_FLAG_CIPHER_SCHEME) {
                        res = ieee80211_crypto_cs_encrypt(tx, skb);
                        if (res != TX_CONTINUE)
                                return res;