diff options
author | David S. Miller <davem@davemloft.net> | 2009-05-05 11:56:07 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-05 11:56:07 -0700 |
commit | 86b698b8cba723fc7e7db50f664ccf0d7da57ee1 (patch) | |
tree | 4c6ec16665caf24b55f8fb6f327c01e3b63f5723 /net/mac80211/tx.c | |
parent | bc83871e8325bb17da2930a76c2a3806377a76c5 (diff) | |
parent | 6909268dc93ae4b0b8e1ebb4b2fa70b1a47dd347 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r-- | net/mac80211/tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 3fb04a86444..63656266d56 100644 --- a/net/mac80211/tx.c +++ b/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; /* |