summaryrefslogtreecommitdiff
path: root/net/mac80211/tx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2015-04-10 14:02:08 +0200
committerJohannes Berg <johannes.berg@intel.com>2015-04-22 10:07:36 +0200
commit725b812c839643639d6135b1f7fb41e48de465a4 (patch)
tree69fcc1082b63b6734d0fa046e1fed98038d0da14 /net/mac80211/tx.c
parent4505d1fe006eae619d765d59977a408c0dd6f571 (diff)
mac80211: extend fast-xmit to driver fragmentation
If the driver handles fragmentation then it wouldn't be done in software so we can still use the fast-xmit path in that case. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r--net/mac80211/tx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 160e1927323d..d983683a8a13 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -2450,7 +2450,8 @@ void ieee80211_check_fast_xmit(struct sta_info *sta)
goto out;
/* fast-xmit doesn't handle fragmentation at all */
- if (local->hw.wiphy->frag_threshold != (u32)-1)
+ if (local->hw.wiphy->frag_threshold != (u32)-1 &&
+ !local->ops->set_frag_threshold)
goto out;
rcu_read_lock();