diff options
| author |   Eric Dumazet <edumazet@google.com> | 2017-05-16 13:27:53 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-05-17 15:10:13 -0400 |
| commit | 9142e9007f2d7ab58a587a1e1d921b0064a339aa (patch) | |
| tree | ec7c29773123e851e8ba6836de7acf5735363eb7 /net/core/sock.c | |
| parent | ipv6: Prevent overrun when parsing v6 header options (diff) | |
| download | linux-dev-9142e9007f2d7ab58a587a1e1d921b0064a339aa.tar.xz linux-dev-9142e9007f2d7ab58a587a1e1d921b0064a339aa.zip | |
net: fix compile error in skb_orphan_partial()
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>
Diffstat (limited to 'net/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index e43e71d7856b..727f924b7f91 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -139,10 +139,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); |