* [PATCH] net: always include tcp.h in sock.c
@ 2017-05-17 8:47 Arnd Bergmann
2017-05-17 14:59 ` Eric Dumazet
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2017-05-17 8:47 UTC (permalink / raw)
To: David S. Miller; +Cc: Arnd Bergmann, Eric Dumazet, netdev, linux-kernel
kernelci reports a build regression in the latest 4.12 snapshots
in configurations without TCP:
net/core/sock.c: In function 'skb_orphan_partial':
net/core/sock.c:1810:6: error: implicit declaration of function 'skb_is_tcp_pure_ack' [-Werror=implicit-function-declaration]
The declaration is simply missing because the header is included
conditionally. There is no real reason to leave out the header, so
this just removes the #ifdef.
Fixes: f6ba8d33cfbb ("netem: fix skb_orphan_partial()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
net/core/sock.c | 3 ---
1 file changed, 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);
--
2.9.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] net: always include tcp.h in sock.c
2017-05-17 8:47 [PATCH] net: always include tcp.h in sock.c Arnd Bergmann
@ 2017-05-17 14:59 ` Eric Dumazet
0 siblings, 0 replies; 2+ messages in thread
From: Eric Dumazet @ 2017-05-17 14:59 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: David S. Miller, Eric Dumazet, netdev, linux-kernel
On Wed, 2017-05-17 at 10:47 +0200, Arnd Bergmann wrote:
> kernelci reports a build regression in the latest 4.12 snapshots
> in configurations without TCP:
>
> net/core/sock.c: In function 'skb_orphan_partial':
> net/core/sock.c:1810:6: error: implicit declaration of function 'skb_is_tcp_pure_ack' [-Werror=implicit-function-declaration]
>
> The declaration is simply missing because the header is included
> conditionally. There is no real reason to leave out the header, so
> this just removes the #ifdef.
>
> Fixes: f6ba8d33cfbb ("netem: fix skb_orphan_partial()")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> net/core/sock.c | 3 ---
> 1 file changed, 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);
I sent the same patch yesterday.
https://patchwork.ozlabs.org/patch/763165/
Thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-17 14:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-17 8:47 [PATCH] net: always include tcp.h in sock.c Arnd Bergmann
2017-05-17 14:59 ` Eric Dumazet
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox