diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-07-31 08:59:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-07-31 08:59:41 -0700 |
| commit | ac5fe22636e2d934056cebcf5d2c9ff7fade6514 (patch) | |
| tree | 64917c15a1af48394064f88f789edd2276afd1fb /net/mac80211/wpa.c | |
| parent | Merge branch 'mlxsw-Test-coverage-for-DSCP-leftover-fix' (diff) | |
| parent | mac80211: HE STA disassoc due to QOS NULL not sent (diff) | |
| download | linux-dev-ac5fe22636e2d934056cebcf5d2c9ff7fade6514.tar.xz linux-dev-ac5fe22636e2d934056cebcf5d2c9ff7fade6514.zip | |
Merge tag 'mac80211-next-for-davem-2019-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
We have a reasonably large number of changes:
* lots more HE (802.11ax) support, particularly things
relevant for the the AP side, but also mesh support
* debugfs cleanups from Greg
* some more work on extended key ID
* start using genl parallel_ops, as preparation for
weaning ourselves off RTNL and getting parallelism
* various other changes all over
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/wpa.c')
| -rw-r--r-- | net/mac80211/wpa.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c index ee72779729e5..91bf32af55e9 100644 --- a/net/mac80211/wpa.c +++ b/net/mac80211/wpa.c @@ -946,7 +946,8 @@ ieee80211_crypto_aes_cmac_encrypt(struct ieee80211_tx_data *tx) info = IEEE80211_SKB_CB(skb); - if (info->control.hw_key) + if (info->control.hw_key && + !(key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_MMIE)) return TX_CONTINUE; if (WARN_ON(skb_tailroom(skb) < sizeof(*mmie))) @@ -962,6 +963,9 @@ ieee80211_crypto_aes_cmac_encrypt(struct ieee80211_tx_data *tx) bip_ipn_set64(mmie->sequence_number, pn64); + if (info->control.hw_key) + return TX_CONTINUE; + bip_aad(skb, aad); /* |