[PATCH ipsec-next] xfrm: avoid compiler warning when ipv6 is disabled

[PATCH ipsec-next] xfrm: avoid compiler warning when ipv6 is disabled

[Florian Westphal]

with CONFIG_IPV6=n:
xfrm_output.c:140:12: warning: 'xfrm6_hdr_offset' defined but not used

Fixes: 9acf4d3b9ec1 ("xfrm: ipv6: add xfrm6_hdr_offset helper")
Signed-off-by: Florian Westphal <fw@strlen.de>
---
 net/xfrm/xfrm_output.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index 3709d3f7c5ce..527da58464f3 100644
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -137,6 +137,7 @@ static int mip6_rthdr_offset(struct sk_buff *skb, u8 **nexthdr, int type)
 }
 #endif
 
+#if IS_ENABLED(CONFIG_IPV6)
 static int xfrm6_hdr_offset(struct xfrm_state *x, struct sk_buff *skb, u8 **prevhdr)
 {
 	switch (x->type->proto) {
@@ -151,6 +152,7 @@ static int xfrm6_hdr_offset(struct xfrm_state *x, struct sk_buff *skb, u8 **prev
 
 	return ip6_find_1stfragopt(skb, prevhdr);
 }
+#endif
 
 /* Add encapsulation header.
  *
-- 
2.31.1

Re: [PATCH ipsec-next] xfrm: avoid compiler warning when ipv6 is disabled

[Steffen Klassert]

On Tue, Jun 15, 2021 at 04:27:20PM +0200, Florian Westphal wrote:
> with CONFIG_IPV6=n:
> xfrm_output.c:140:12: warning: 'xfrm6_hdr_offset' defined but not used
> 
> Fixes: 9acf4d3b9ec1 ("xfrm: ipv6: add xfrm6_hdr_offset helper")
> Signed-off-by: Florian Westphal <fw@strlen.de>

Applied, thanks!