diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 160e1927323d3a26ad30752d449298764b147dec..d983683a8a13e700830080eced49801e79274933 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();