diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-24 01:54:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-24 01:54:03 -0400 |
| commit | 06802a819a0a2d31c952c0624cea6cd00e4e50da (patch) | |
| tree | 8ccd7c668c7fbd8f08cb89426006040217caf3f1 /net/ipv4/tcp.c | |
| parent | 9bd512f619cc116b7830134d7c9f6e404a38c7bf (diff) | |
| parent | 8f3ea33a5078a09eba12bfe57424507809367756 (diff) | |
Merge branch 'master' of ../net-2.6/
Conflicts:
net/ipv6/ndisc.c
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index e0fbc25ca816..58ac838bf460 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
| @@ -735,7 +735,7 @@ new_segment: | |||
| 735 | if (!(psize -= copy)) | 735 | if (!(psize -= copy)) |
| 736 | goto out; | 736 | goto out; |
| 737 | 737 | ||
| 738 | if (skb->len < mss_now || (flags & MSG_OOB)) | 738 | if (skb->len < size_goal || (flags & MSG_OOB)) |
| 739 | continue; | 739 | continue; |
| 740 | 740 | ||
| 741 | if (forced_push(tp)) { | 741 | if (forced_push(tp)) { |
| @@ -981,7 +981,7 @@ new_segment: | |||
| 981 | if ((seglen -= copy) == 0 && iovlen == 0) | 981 | if ((seglen -= copy) == 0 && iovlen == 0) |
| 982 | goto out; | 982 | goto out; |
| 983 | 983 | ||
| 984 | if (skb->len < mss_now || (flags & MSG_OOB)) | 984 | if (skb->len < size_goal || (flags & MSG_OOB)) |
| 985 | continue; | 985 | continue; |
| 986 | 986 | ||
| 987 | if (forced_push(tp)) { | 987 | if (forced_push(tp)) { |