| Message ID | 5443FD47.7040003@gmx.at |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sun, 2014-10-19 at 20:04 +0200, Manfred Schlaegl wrote: > If CONFIG_IPV6=n, then h6 in struct tcp_skb_cb.header is missing which > leads to compilation-errors on tcp_v6_iff like: > > In file included from net/core/sock.c:140:0: > include/net/tcp.h: In function ‘tcp_v6_iif’: > include/net/tcp.h:738:32: error: ‘union <anonymous>’ has no member named > ‘h6’ > > This fix solves the problem by removing tcp_v6_iif, in case of > CONFIG_IPV6=n. > > Signed-off-by: Manfred Schlaegl <manfred.schlaegl@gmx.at> > --- Yes, this was fixed yesterday, thanks. http://git.kernel.org/cgit/linux/kernel/git/davem/net.git/commit/?id=815afe1785da727ee48cd8e63ac4a3ec6c7459b3 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/net/tcp.h b/include/net/tcp.h index c9766f8..4062b4f 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.
If CONFIG_IPV6=n, then h6 in struct tcp_skb_cb.header is missing which leads to compilation-errors on tcp_v6_iff like: In file included from net/core/sock.c:140:0: include/net/tcp.h: In function ‘tcp_v6_iif’: include/net/tcp.h:738:32: error: ‘union <anonymous>’ has no member named ‘h6’ This fix solves the problem by removing tcp_v6_iif, in case of CONFIG_IPV6=n. Signed-off-by: Manfred Schlaegl <manfred.schlaegl@gmx.at> --- include/net/tcp.h | 2 ++ 1 file changed, 2 insertions(+)