summaryrefslogtreecommitdiffstats
path: root/net/mac80211/tx.c
diff options
context:
space:
mode:
authorDavid Spinadel2017-12-01 12:50:52 +0100
committerJohannes Berg2017-12-11 12:20:17 +0100
commit9de18d8186cb070d22ed67a3f75a2ef5fbf3ef6f (patch)
tree936a15e2817360d322ebe90373099da0d3f478a9 /net/mac80211/tx.c
parentmac80211: don't warn on AID field without top two MSBs set (diff)
downloadkernel-qcow2-linux-9de18d8186cb070d22ed67a3f75a2ef5fbf3ef6f.tar.gz
kernel-qcow2-linux-9de18d8186cb070d22ed67a3f75a2ef5fbf3ef6f.tar.xz
kernel-qcow2-linux-9de18d8186cb070d22ed67a3f75a2ef5fbf3ef6f.zip
mac80211: Add MIC space only for TX key option
Add a key flag to indicates that the device only needs MIC space and not a real MIC. In such cases, keep the MIC zeroed for ease of debug. Signed-off-by: David Spinadel <david.spinadel@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r--net/mac80211/tx.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 3160954fc406..25904af38839 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -2922,7 +2922,9 @@ void ieee80211_check_fast_xmit(struct sta_info *sta)
gen_iv = build.key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV;
iv_spc = build.key->conf.flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE;
- mmic = build.key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_MMIC;
+ mmic = build.key->conf.flags &
+ (IEEE80211_KEY_FLAG_GENERATE_MMIC |
+ IEEE80211_KEY_FLAG_PUT_MIC_SPACE);
/* don't handle software crypto */
if (!(build.key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE))