aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2014-10-18 11:34:37 -0400
committerDavid S. Miller <davem@davemloft.net>2014-10-18 13:01:36 -0400
commit815afe1785da727ee48cd8e63ac4a3ec6c7459b3 (patch)
tree25e93d3aec3956d5c9cb3703122e1416c397c1fb /include/net
parentf2d9da1a8375cbe53df5b415d059429013a3a79f (diff)
tcp: fix build error if IPv6 is not enabled
$ 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()") Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/tcp.h2
1 files changed, 2 insertions, 0 deletions
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 {
730#define TCP_SKB_CB(__skb) ((struct tcp_skb_cb *)&((__skb)->cb[0])) 730#define TCP_SKB_CB(__skb) ((struct tcp_skb_cb *)&((__skb)->cb[0]))
731 731
732 732
733#if IS_ENABLED(CONFIG_IPV6)
733/* This is the variant of inet6_iif() that must be used by TCP, 734/* This is the variant of inet6_iif() that must be used by TCP,
734 * as TCP moves IP6CB into a different location in skb->cb[] 735 * as TCP moves IP6CB into a different location in skb->cb[]
735 */ 736 */
@@ -737,6 +738,7 @@ static inline int tcp_v6_iif(const struct sk_buff *skb)
737{ 738{
738 return TCP_SKB_CB(skb)->header.h6.iif; 739 return TCP_SKB_CB(skb)->header.h6.iif;
739} 740}
741#endif
740 742
741/* Due to TSO, an SKB can be composed of multiple actual 743/* Due to TSO, an SKB can be composed of multiple actual
742 * packets. To keep these tracked properly, we use this. 744 * packets. To keep these tracked properly, we use this.