提交 815afe17 编写于 作者: E Eric Dumazet 提交者: David S. Miller

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: NEric Dumazet <edumazet@google.com>
Fixes: 870c3151 ("ipv6: introduce tcp_v6_iif()")
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 f2d9da1a
...@@ -730,6 +730,7 @@ struct tcp_skb_cb { ...@@ -730,6 +730,7 @@ struct tcp_skb_cb {
#define TCP_SKB_CB(__skb) ((struct tcp_skb_cb *)&((__skb)->cb[0])) #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, /* This is the variant of inet6_iif() that must be used by TCP,
* as TCP moves IP6CB into a different location in skb->cb[] * 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) ...@@ -737,6 +738,7 @@ static inline int tcp_v6_iif(const struct sk_buff *skb)
{ {
return TCP_SKB_CB(skb)->header.h6.iif; return TCP_SKB_CB(skb)->header.h6.iif;
} }
#endif
/* Due to TSO, an SKB can be composed of multiple actual /* Due to TSO, an SKB can be composed of multiple actual
* packets. To keep these tracked properly, we use this. * packets. To keep these tracked properly, we use this.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册