* [PATCH net] geneve: only configure or fill UDP_ZERO_CSUM6_RX/TX info when CONFIG_IPV6
@ 2017-11-23 3:27 Hangbin Liu
2017-11-23 12:35 ` Stefano Brivio
2017-11-23 18:30 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Hangbin Liu @ 2017-11-23 3:27 UTC (permalink / raw)
To: netdev
Cc: Stefano Brivio, Eric Garver, Pravin B Shelar, David S. Miller,
Hangbin Liu
Stefano pointed that configure or show UDP_ZERO_CSUM6_RX/TX info doesn't
make sense if we haven't enabled CONFIG_IPV6. Fix it by adding
if IS_ENABLED(CONFIG_IPV6) check.
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
---
drivers/net/geneve.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index 4e16d83..b718a02 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -1337,21 +1337,33 @@ static int geneve_nl2info(struct nlattr *tb[], struct nlattr *data[],
}
if (data[IFLA_GENEVE_UDP_ZERO_CSUM6_TX]) {
+#if IS_ENABLED(CONFIG_IPV6)
if (changelink) {
attrtype = IFLA_GENEVE_UDP_ZERO_CSUM6_TX;
goto change_notsup;
}
if (nla_get_u8(data[IFLA_GENEVE_UDP_ZERO_CSUM6_TX]))
info->key.tun_flags &= ~TUNNEL_CSUM;
+#else
+ NL_SET_ERR_MSG_ATTR(extack, data[IFLA_GENEVE_UDP_ZERO_CSUM6_TX],
+ "IPv6 support not enabled in the kernel");
+ return -EPFNOSUPPORT;
+#endif
}
if (data[IFLA_GENEVE_UDP_ZERO_CSUM6_RX]) {
+#if IS_ENABLED(CONFIG_IPV6)
if (changelink) {
attrtype = IFLA_GENEVE_UDP_ZERO_CSUM6_RX;
goto change_notsup;
}
if (nla_get_u8(data[IFLA_GENEVE_UDP_ZERO_CSUM6_RX]))
*use_udp6_rx_checksums = false;
+#else
+ NL_SET_ERR_MSG_ATTR(extack, data[IFLA_GENEVE_UDP_ZERO_CSUM6_RX],
+ "IPv6 support not enabled in the kernel");
+ return -EPFNOSUPPORT;
+#endif
}
return 0;
@@ -1527,11 +1539,13 @@ static int geneve_fill_info(struct sk_buff *skb, const struct net_device *dev)
goto nla_put_failure;
if (metadata && nla_put_flag(skb, IFLA_GENEVE_COLLECT_METADATA))
- goto nla_put_failure;
+ goto nla_put_failure;
+#if IS_ENABLED(CONFIG_IPV6)
if (nla_put_u8(skb, IFLA_GENEVE_UDP_ZERO_CSUM6_RX,
!geneve->use_udp6_rx_checksums))
goto nla_put_failure;
+#endif
return 0;
--
2.5.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net] geneve: only configure or fill UDP_ZERO_CSUM6_RX/TX info when CONFIG_IPV6
2017-11-23 3:27 [PATCH net] geneve: only configure or fill UDP_ZERO_CSUM6_RX/TX info when CONFIG_IPV6 Hangbin Liu
@ 2017-11-23 12:35 ` Stefano Brivio
2017-11-23 13:01 ` Hangbin Liu
2017-11-23 18:30 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Stefano Brivio @ 2017-11-23 12:35 UTC (permalink / raw)
To: Hangbin Liu; +Cc: netdev, Eric Garver, Pravin B Shelar, David S. Miller
On Thu, 23 Nov 2017 11:27:24 +0800
Hangbin Liu <liuhangbin@gmail.com> wrote:
> Stefano pointed that configure or show UDP_ZERO_CSUM6_RX/TX info doesn't
> make sense if we haven't enabled CONFIG_IPV6. Fix it by adding
> if IS_ENABLED(CONFIG_IPV6) check.
Thanks for fixing this. I would add:
Suggested-by: Stefano Brivio <sbrivio@redhat.com>
Fixes: abe492b4f50c ("geneve: UDP checksum configuration via netlink")
Fixes: fd7eafd02121 ("geneve: fix fill_info when link down")
> Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
--
Stefano
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net] geneve: only configure or fill UDP_ZERO_CSUM6_RX/TX info when CONFIG_IPV6
2017-11-23 12:35 ` Stefano Brivio
@ 2017-11-23 13:01 ` Hangbin Liu
0 siblings, 0 replies; 4+ messages in thread
From: Hangbin Liu @ 2017-11-23 13:01 UTC (permalink / raw)
To: Stefano Brivio; +Cc: netdev, Eric Garver, Pravin B Shelar, David S. Miller
On Thu, Nov 23, 2017 at 01:35:26PM +0100, Stefano Brivio wrote:
> On Thu, 23 Nov 2017 11:27:24 +0800
> Hangbin Liu <liuhangbin@gmail.com> wrote:
>
> > Stefano pointed that configure or show UDP_ZERO_CSUM6_RX/TX info doesn't
> > make sense if we haven't enabled CONFIG_IPV6. Fix it by adding
> > if IS_ENABLED(CONFIG_IPV6) check.
>
> Thanks for fixing this. I would add:
>
> Suggested-by: Stefano Brivio <sbrivio@redhat.com>
> Fixes: abe492b4f50c ("geneve: UDP checksum configuration via netlink")
> Fixes: fd7eafd02121 ("geneve: fix fill_info when link down")
Thanks Stefano for help adding these.
>
> > Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
>
> Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
>
Regards
Hangbin
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net] geneve: only configure or fill UDP_ZERO_CSUM6_RX/TX info when CONFIG_IPV6
2017-11-23 3:27 [PATCH net] geneve: only configure or fill UDP_ZERO_CSUM6_RX/TX info when CONFIG_IPV6 Hangbin Liu
2017-11-23 12:35 ` Stefano Brivio
@ 2017-11-23 18:30 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2017-11-23 18:30 UTC (permalink / raw)
To: liuhangbin; +Cc: netdev, sbrivio, e, pshelar
From: Hangbin Liu <liuhangbin@gmail.com>
Date: Thu, 23 Nov 2017 11:27:24 +0800
> Stefano pointed that configure or show UDP_ZERO_CSUM6_RX/TX info doesn't
> make sense if we haven't enabled CONFIG_IPV6. Fix it by adding
> if IS_ENABLED(CONFIG_IPV6) check.
>
> Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Applied, thank you.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-11-23 18:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-23 3:27 [PATCH net] geneve: only configure or fill UDP_ZERO_CSUM6_RX/TX info when CONFIG_IPV6 Hangbin Liu
2017-11-23 12:35 ` Stefano Brivio
2017-11-23 13:01 ` Hangbin Liu
2017-11-23 18:30 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).