summaryrefslogtreecommitdiffstats
path: root/net/mac80211/tx.c
diff options
context:
space:
mode:
authorSara Sharon <sara.sharon@intel.com>2016-10-18 23:12:11 +0300
committerJohannes Berg <johannes.berg@intel.com>2016-10-19 12:12:44 +0200
commitf3fe4e93dd6346c01fd4070ae02ec746fbae73bb (patch)
tree3ab6bd9fe32aec5bbc380a6a3ba250069b1131a1 /net/mac80211/tx.c
parent0aa419ec6e7b98d485f6c66a62a90965eda3c1bb (diff)
downloadlinux-stable-f3fe4e93dd6346c01fd4070ae02ec746fbae73bb.tar.gz
linux-stable-f3fe4e93dd6346c01fd4070ae02ec746fbae73bb.tar.bz2
linux-stable-f3fe4e93dd6346c01fd4070ae02ec746fbae73bb.zip
mac80211: add a HW flag for supporting HW TX fragmentation
Currently mac80211 determines whether HW does fragmentation by checking whether the set_frag_threshold callback is set or not. However, some drivers may want to set the HW fragmentation capability depending on HW generation. Allow this by checking a HW flag instead of checking the callback. Signed-off-by: Sara Sharon <sara.sharon@intel.com> [added the flag to ath10k and wlcore] 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, 2 insertions, 2 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 772e36909fa3..62ccaf6f585d 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -934,7 +934,7 @@ ieee80211_tx_h_fragment(struct ieee80211_tx_data *tx)
if (info->flags & IEEE80211_TX_CTL_DONTFRAG)
return TX_CONTINUE;
- if (tx->local->ops->set_frag_threshold)
+ if (ieee80211_hw_check(&tx->local->hw, SUPPORTS_TX_FRAG))
return TX_CONTINUE;
/*
@@ -2800,7 +2800,7 @@ void ieee80211_check_fast_xmit(struct sta_info *sta)
/* fast-xmit doesn't handle fragmentation at all */
if (local->hw.wiphy->frag_threshold != (u32)-1 &&
- !local->ops->set_frag_threshold)
+ !ieee80211_hw_check(&local->hw, SUPPORTS_TX_FRAG))
goto out;
rcu_read_lock();