diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-24 06:54:03 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-24 06:54:03 +0100 |
| commit | 06802a819a0a2d31c952c0624cea6cd00e4e50da (patch) | |
| tree | 8ccd7c668c7fbd8f08cb89426006040217caf3f1 /net/ipv4/tcp.c | |
| parent | [CASSINI]: Use shorter list_splice_init() macro for brevity. (diff) | |
| parent | sch_htb: fix "too many events" situation (diff) | |
| download | linux-06802a819a0a2d31c952c0624cea6cd00e4e50da.tar.xz linux-06802a819a0a2d31c952c0624cea6cd00e4e50da.zip | |
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: if (!(psize -= copy)) goto out; - if (skb->len < mss_now || (flags & MSG_OOB)) + if (skb->len < size_goal || (flags & MSG_OOB)) continue; if (forced_push(tp)) { @@ -981,7 +981,7 @@ new_segment: if ((seglen -= copy) == 0 && iovlen == 0) goto out; - if (skb->len < mss_now || (flags & MSG_OOB)) + if (skb->len < size_goal || (flags & MSG_OOB)) continue; if (forced_push(tp)) { |