* [PATCH] tcp: fix build error if IPv6 is not enabled
@ 2014-10-18 15:34 Eric Dumazet
2014-10-18 17:02 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Eric Dumazet @ 2014-10-18 15:34 UTC (permalink / raw)
To: David Miller; +Cc: netdev
From: Eric Dumazet <edumazet@google.com>
$ make M=net/ipv4
CC net/ipv4/route.o
In file included from net/ipv4/route.c:102:0:
include/net/tcp.h: In function ‘tcp_v6_iif’:
include/net/tcp.h:738:32: error: ‘union <anonymous>’ has no member named ‘h6’
return TCP_SKB_CB(skb)->header.h6.iif;
Signed-off-by: Eric Dumazet <edumazet@google.com>
Fixes: 870c3151382c ("ipv6: introduce tcp_v6_iif()")
---
include/net/tcp.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/net/tcp.h b/include/net/tcp.h
index c9766f89deba..4062b4f0d121 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -730,6 +730,7 @@ struct tcp_skb_cb {
#define TCP_SKB_CB(__skb) ((struct tcp_skb_cb *)&((__skb)->cb[0]))
+#if IS_ENABLED(CONFIG_IPV6)
/* This is the variant of inet6_iif() that must be used by TCP,
* as TCP moves IP6CB into a different location in skb->cb[]
*/
@@ -737,6 +738,7 @@ static inline int tcp_v6_iif(const struct sk_buff *skb)
{
return TCP_SKB_CB(skb)->header.h6.iif;
}
+#endif
/* Due to TSO, an SKB can be composed of multiple actual
* packets. To keep these tracked properly, we use this.
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] tcp: fix build error if IPv6 is not enabled
2014-10-18 15:34 [PATCH] tcp: fix build error if IPv6 is not enabled Eric Dumazet
@ 2014-10-18 17:02 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2014-10-18 17:02 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sat, 18 Oct 2014 08:34:37 -0700
> From: Eric Dumazet <edumazet@google.com>
>
> $ make M=net/ipv4
> CC net/ipv4/route.o
> In file included from net/ipv4/route.c:102:0:
> include/net/tcp.h: In function ‘tcp_v6_iif’:
> include/net/tcp.h:738:32: error: ‘union <anonymous>’ has no member named ‘h6’
> return TCP_SKB_CB(skb)->header.h6.iif;
>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Fixes: 870c3151382c ("ipv6: introduce tcp_v6_iif()")
Applied, thanks Eric.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-10-18 17:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-18 15:34 [PATCH] tcp: fix build error if IPv6 is not enabled Eric Dumazet
2014-10-18 17:02 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).