diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-04-07 16:45:40 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-07 16:45:40 -0400 |
| commit | b37e3b6d64358604960b35e8ecbb7aed22e0926e (patch) | |
| tree | f9673afc2332c15a989d3b32f002363a92ea66e1 /net/ipv4/tcp_output.c | |
| parent | a90c7a313a1c5b4fc99f987a2ae8f92ab0ae35c7 (diff) | |
| parent | bd39a274fb7b43374c797bafdb7f506598f36f77 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/rtlwifi/efuse.c
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
net/bluetooth/mgmt.c
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index dfa5beb0c1c8..8b0d0167e44a 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
| @@ -1003,7 +1003,8 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, | |||
| 1003 | int nlen; | 1003 | int nlen; |
| 1004 | u8 flags; | 1004 | u8 flags; |
| 1005 | 1005 | ||
| 1006 | BUG_ON(len > skb->len); | 1006 | if (WARN_ON(len > skb->len)) |
| 1007 | return -EINVAL; | ||
| 1007 | 1008 | ||
| 1008 | nsize = skb_headlen(skb) - len; | 1009 | nsize = skb_headlen(skb) - len; |
| 1009 | if (nsize < 0) | 1010 | if (nsize < 0) |