diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-24 22:31:46 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-24 22:31:46 -0400 |
| commit | 16fddf5457d2a7eb5e96ceb016a8f722eca97af6 (patch) | |
| tree | ae3083a50c55f1e1a2c83f475d0e8bb2da8d7196 /net/ipv4/tcp.c | |
| parent | 5492a7e4cba8e38419d489f0865de0a67c737e8a (diff) | |
| parent | cc7feea39bed2951cc29af3ad642f39a99dfe8d3 (diff) | |
Merge branch 'linux-2.6' into merge
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 071e83a894ad..39b629ac2404 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)) { |