diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-08 11:48:30 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-08 11:48:30 +0200 |
| commit | 22f6dacdfcfdc792d068e9c41234808860498d04 (patch) | |
| tree | 281a7d476f256ea3e2f800177ba685b169cc0540 /net/mac80211/tx.c | |
| parent | smsc911x: fix calculation of res_size for ioremap (diff) | |
| parent | net: remove stale reference to fastroute from Kconfig help text (diff) | |
| download | linux-22f6dacdfcfdc792d068e9c41234808860498d04.tar.xz linux-22f6dacdfcfdc792d068e9c41234808860498d04.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
include/net/tcp.h
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 1865622003c9..e5b148fe24bb 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -787,7 +787,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; /* |