diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 00:22:26 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 00:22:26 -0400 |
| commit | 399f486286f44d55c4fff0e9cc5d712f2b443489 (patch) | |
| tree | 0c2820b3e04232eaa96f08c1057b87728fb3e7a4 /net/ipv4/tcp.c | |
| parent | 481419ec9fbdf3f4ec5389c7e91a81b4a7ebee8d (diff) | |
| parent | a9edadbf790d72adf6ebed476cb5caf7743e7e4a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
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)) { |