commit 4496d8a3add9b77e2184597320e01105f238a79b
author Johannes Berg <johannes.berg@intel.com> Fri Apr 10 14:02:08 2015 +0200
committer Marty Faltesek <mfaltesek@google.com> Mon May 11 20:29:41 2015 -0400
tree 7e08ce80b6b4b9a0728bf5cadff32b996fd25768
parent 22db3024a3e646a4e0bd52ea17f6243be40337ac

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.

Change-Id: I6fb90a75ee41ea46472fd27a0e4595742ed3179b
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

net/mac80211/tx.c

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index b5b8446..8618c21 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -2450,7 +2450,8 @@
 		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();