diff options
| author | David S. Miller | 2012-05-20 21:53:04 -0400 |
|---|---|---|
| committer | David S. Miller | 2012-05-20 21:53:04 -0400 |
| commit | 17eea0df5f7068fc04959e655ef8f0a0ed097e19 (patch) | |
| tree | d44b5cceb813dddfd1e62fe9f92556cf113d62fd /net | |
| parent | 9b905fe68433378032b851c4d81a59187689fa52 (diff) | |
| parent | 76e10d158efb6d4516018846f60c2ab5501900bc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/pktgen.c | 4 | ||||
| -rw-r--r-- | net/ipv4/tcp.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 30eb768cd677..cce9e53528b1 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -3749,13 +3749,13 @@ static void __exit pg_cleanup(void) { struct pktgen_thread *t; struct list_head *q, *n; - struct list_head list; + LIST_HEAD(list); /* Stop all interfaces & threads */ pktgen_exiting = true; mutex_lock(&pktgen_thread_lock); - list_splice(&list, &pktgen_threads); + list_splice_init(&pktgen_threads, &list); mutex_unlock(&pktgen_thread_lock); list_for_each_safe(q, n, &list) { diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index e13546ca9923..bb485fcb077e 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -917,8 +917,7 @@ new_segment: wait_for_sndbuf: set_bit(SOCK_NOSPACE, &sk->sk_socket->flags); wait_for_memory: - if (copied) - tcp_push(sk, flags & ~MSG_MORE, mss_now, TCP_NAGLE_PUSH); + tcp_push(sk, flags & ~MSG_MORE, mss_now, TCP_NAGLE_PUSH); if ((err = sk_stream_wait_memory(sk, &timeo)) != 0) goto do_error; |