diff options
| author | Sara Sharon <sara.sharon@intel.com> | 2016-02-24 11:49:45 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2016-04-05 10:48:56 +0200 |
| commit | f980ebc058c2fa2a552e495db1de0b330082ab70 (patch) | |
| tree | aa224a4750de5e222ea022eab28b146921ba9679 /net/mac80211/util.c | |
| parent | 162dd6a7253ab009c6335c21ce6b80cf227ddda4 (diff) | |
| download | blackbird-op-linux-f980ebc058c2fa2a552e495db1de0b330082ab70.tar.gz blackbird-op-linux-f980ebc058c2fa2a552e495db1de0b330082ab70.zip | |
mac80211: allow not sending MIC up from driver for HW crypto
When HW crypto is used, there's no need for the CCMP/GCMP MIC to
be available to mac80211, and the hardware might have removed it
already after checking. The MIC is also useless to have when the
frame is already decrypted, so allow indicating that it's not
present.
Since we are running out of bits in mac80211_rx_flags, make
the flags field a u64.
Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/util.c')
| -rw-r--r-- | net/mac80211/util.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 7390de4946a9..0319d6d4f863 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -2724,8 +2724,9 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local, rate = cfg80211_calculate_bitrate(&ri); if (WARN_ONCE(!rate, - "Invalid bitrate: flags=0x%x, idx=%d, vht_nss=%d\n", - status->flag, status->rate_idx, status->vht_nss)) + "Invalid bitrate: flags=0x%llx, idx=%d, vht_nss=%d\n", + (unsigned long long)status->flag, status->rate_idx, + status->vht_nss)) return 0; /* rewind from end of MPDU */ |
