3.16.48-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Eric Dumazet <[email protected]> commit 9142e9007f2d7ab58a587a1e1d921b0064a339aa upstream. 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 <[email protected]> Reported-by: Paul Gortmaker <[email protected]> Reported-by: Randy Dunlap <[email protected]> Reported-by: Stephen Rothwell <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Ben Hutchings <[email protected]> --- net/core/sock.c | 3 --- 1 file changed, 3 deletions(-) --- a/net/core/sock.c +++ b/net/core/sock.c @@ -136,10 +136,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);
