[PATCH] ipv6: tcp_v6_iff: fix compilation error on CONFIG_IPV6=n

[Manfred Schlaegl]

If CONFIG_IPV6=3Dn, then h6 in struct tcp_skb_cb.header is missing whic=
h
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 =E2=80=98tcp_v6_iif=E2=80=99:
include/net/tcp.h:738:32: error: =E2=80=98union <anonymous>=E2=80=99 ha=
s no member named
=E2=80=98h6=E2=80=99

This fix solves the problem by removing tcp_v6_iif, in case of
CONFIG_IPV6=3Dn.

Signed-off-by: Manfred Schlaegl <***@gmx.at>
---
include/net/tcp.h | 2 ++
1 file changed, 2 insertions(+)

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.
--=20
1.7.10.4

[Eric Dumazet]

If CONFIG_IPV6=3Dn, then h6 in struct tcp_skb_cb.header is missing wh=

ich

=20
include/net/tcp.h:738:32: error: =E2=80=98union <anonymous>=E2=80=99 =

has no member named

=E2=80=98h6=E2=80=99
=20
This fix solves the problem by removing tcp_v6_iif, in case of
CONFIG_IPV6=3Dn.
=20
---

Yes, this was fixed yesterday, thanks.

http://git.kernel.org/cgit/linux/kernel/git/davem/net.git/commit/?id=3D=
815afe1785da727ee48cd8e63ac4a3ec6c7459b3