diff --git a/[refs] b/[refs]
index f348643f91de..7728903cf58a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ee59f8d0dcab2e114546038b2b224776c82b7f7
+refs/heads/master: 8ccd8f21122dcc30a665516d43aa8b4aa8ae51f6
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index 3fb04a86444d..63656266d567 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -772,7 +772,7 @@ ieee80211_tx_h_fragment(struct ieee80211_tx_data *tx)
 	hdrlen = ieee80211_hdrlen(hdr->frame_control);
 
 	/* internal error, why is TX_FRAGMENTED set? */
-	if (WARN_ON(skb->len <= frag_threshold))
+	if (WARN_ON(skb->len + FCS_LEN <= frag_threshold))
 		return TX_DROP;
 
 	/*