diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-08 05:48:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-08 05:48:30 -0400 |
| commit | 22f6dacdfcfdc792d068e9c41234808860498d04 (patch) | |
| tree | 281a7d476f256ea3e2f800177ba685b169cc0540 /net/mac80211/tx.c | |
| parent | 928f308f556f4943e50c5064b546f47bce301f02 (diff) | |
| parent | 9b05126baa146fc3f41360164141d4e1b3ea93c4 (diff) | |
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) | |||
| 787 | hdrlen = ieee80211_hdrlen(hdr->frame_control); | 787 | hdrlen = ieee80211_hdrlen(hdr->frame_control); |
| 788 | 788 | ||
| 789 | /* internal error, why is TX_FRAGMENTED set? */ | 789 | /* internal error, why is TX_FRAGMENTED set? */ |
| 790 | if (WARN_ON(skb->len <= frag_threshold)) | 790 | if (WARN_ON(skb->len + FCS_LEN <= frag_threshold)) |
| 791 | return TX_DROP; | 791 | return TX_DROP; |
| 792 | 792 | ||
| 793 | /* | 793 | /* |