Commit bfe099f7 authored by Eric Dumazet's avatar Eric Dumazet Committed by Ben Hutchings

net: fix compile error in skb_orphan_partial()

commit 9142e900 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: f6ba8d33 ("netem: fix skb_orphan_partial()")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reported-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Reported-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent c194c404
...@@ -136,10 +136,7 @@ ...@@ -136,10 +136,7 @@
#include <trace/events/sock.h> #include <trace/events/sock.h>
#ifdef CONFIG_INET
#include <net/tcp.h> #include <net/tcp.h>
#endif
#include <net/busy_poll.h> #include <net/busy_poll.h>
static DEFINE_MUTEX(proto_list_mutex); static DEFINE_MUTEX(proto_list_mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment