lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ../net-2.6/

Browse Source 
Conflicts:

	net/ipv6/ndisc.c
This commit is contained in:
David S. Miller
2008-03-23 22:54:03 -07:00
parent 9bd512f619 8f3ea33a50
commit 06802a819a
12 changed files with 43 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/ipv4/tcp.c
View File

@@ -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)) {