Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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;