diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2011-10-07 14:01:25 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-10-11 16:41:19 -0400 |
| commit | a26eb27ab430147a82e4a9f2f1ebfadf03d99550 (patch) | |
| tree | 105c1b9db15ae37f4d69e22bf666861ed78a540e /net/mac80211/wpa.c | |
| parent | 68f2b517bcbd81cb19321d5ca208d4c0f13b8728 (diff) | |
| download | blackbird-op-linux-a26eb27ab430147a82e4a9f2f1ebfadf03d99550.tar.gz blackbird-op-linux-a26eb27ab430147a82e4a9f2f1ebfadf03d99550.zip | |
mac80211: move fragment flag to info flag as dont-fragment
The purpose of this is two-fold:
1) by moving it out of tx_data.flags, we can in
another patch move the radiotap parsing so it
no longer is in the hotpath
2) if a device implements fragmentation but can
optionally skip it, the radiotap request for
not doing fragmentation may be honoured
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/wpa.c')
| -rw-r--r-- | net/mac80211/wpa.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c index 7bc8702808fa..f614ce7bb6e3 100644 --- a/net/mac80211/wpa.c +++ b/net/mac80211/wpa.c @@ -53,7 +53,8 @@ ieee80211_tx_h_michael_mic_add(struct ieee80211_tx_data *tx) } if (info->control.hw_key && - !(tx->flags & IEEE80211_TX_FRAGMENTED) && + (info->flags & IEEE80211_TX_CTL_DONTFRAG || + tx->local->ops->set_frag_threshold) && !(tx->key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_MMIC)) { /* hwaccel - with no need for SW-generated MMIC */ return TX_CONTINUE; |
