Patch "net: fix compile error in skb_orphan_partial()" has been added to the 4.9-stable tree

Patch "net: fix compile error in skb_orphan_partial()" has been added to the 4.9-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    net: fix compile error in skb_orphan_partial()

to the 4.9-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     net-fix-compile-error-in-skb_orphan_partial.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From foo@baz Wed May 31 09:13:34 JST 2017
From: Eric Dumazet <edumazet@google.com>
Date: Tue, 16 May 2017 13:27:53 -0700
Subject: net: fix compile error in skb_orphan_partial()

From: Eric Dumazet <edumazet@google.com>


[ Upstream commit 9142e9007f2d7ab58a587a1e1d921b0064a339aa ]

If CONFIG_INET is not set, net/core/sock.c can not compile :

net/core/sock.c: In function ‘skb_orphan_partial’:
net/core/sock.c:1810:2: error: implicit declaration of function
‘skb_is_tcp_pure_ack’ [-Werror=implicit-function-declaration]
  if (skb_is_tcp_pure_ack(skb))
  ^

Fix this by always including <net/tcp.h>

Fixes: f6ba8d33cfbb ("netem: fix skb_orphan_partial()")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/core/sock.c |    3 ---
 1 file changed, 3 deletions(-)

--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -138,10 +138,7 @@
 
 #include <trace/events/sock.h>
 
-#ifdef CONFIG_INET
 #include <net/tcp.h>
-#endif
-
 #include <net/busy_poll.h>
 
 static DEFINE_MUTEX(proto_list_mutex);


Patches currently in stable-queue which might be from edumazet@google.com are

queue-4.9/ipv6-fix-out-of-bound-writes-in-__ip6_append_data.patch
queue-4.9/tcp-eliminate-negative-reordering-in-tcp_clean_rtx_queue.patch
queue-4.9/dccp-tcp-do-not-inherit-mc_list-from-parent.patch
queue-4.9/tcp-avoid-fragmenting-peculiar-skbs-in-sack.patch
queue-4.9/netem-fix-skb_orphan_partial.patch
queue-4.9/net-fix-compile-error-in-skb_orphan_partial.patch
queue-4.9/ipv6-dccp-do-not-inherit-ipv6_mc_list-from-parent.patch
queue-4.9/sctp-do-not-inherit-ipv6_-mc-ac-fl-_list-from-parent.patch
queue-4.9/ipv4-add-reference-counting-to-metrics.patch
queue-4.9/tcp-avoid-fastopen-api-to-be-used-on-af_unspec.patch