AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-24 20:50:53 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

geneve: only configure or fill UDP_ZERO_CSUM6_RX/TX info when CONFIG_IPV6

Browse Source 
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.

Fixes: abe492b4f5 ("geneve: UDP checksum configuration via netlink")
Fixes: fd7eafd021 ("geneve: fix fill_info when link down")
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Hangbin Liu 2017-11-23 11:27:24 +08:00 committed by David S. Miller
parent d6efab626c
commit f9094b7603
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/geneve.c
View File

@ -1337,21 +1337,33 @@ static int geneve_nl2info(struct nlattr *tb[], struct nlattr *data[],
} }
if (data[IFLA_GENEVE_UDP_ZERO_CSUM6_TX]) { if (data[IFLA_GENEVE_UDP_ZERO_CSUM6_TX]) {
#if IS_ENABLED(CONFIG_IPV6)
if (changelink) { if (changelink) {
attrtype = IFLA_GENEVE_UDP_ZERO_CSUM6_TX; attrtype = IFLA_GENEVE_UDP_ZERO_CSUM6_TX;
goto change_notsup; goto change_notsup;
} }
if (nla_get_u8(data[IFLA_GENEVE_UDP_ZERO_CSUM6_TX])) if (nla_get_u8(data[IFLA_GENEVE_UDP_ZERO_CSUM6_TX]))
info->key.tun_flags &= ~TUNNEL_CSUM; 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 (data[IFLA_GENEVE_UDP_ZERO_CSUM6_RX]) {
#if IS_ENABLED(CONFIG_IPV6)
if (changelink) { if (changelink) {
attrtype = IFLA_GENEVE_UDP_ZERO_CSUM6_RX; attrtype = IFLA_GENEVE_UDP_ZERO_CSUM6_RX;
goto change_notsup; goto change_notsup;
} }
if (nla_get_u8(data[IFLA_GENEVE_UDP_ZERO_CSUM6_RX])) if (nla_get_u8(data[IFLA_GENEVE_UDP_ZERO_CSUM6_RX]))
*use_udp6_rx_checksums = false; *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; return 0;
@ -1527,11 +1539,13 @@ static int geneve_fill_info(struct sk_buff *skb, const struct net_device *dev)
goto nla_put_failure; goto nla_put_failure;
if (metadata && nla_put_flag(skb, IFLA_GENEVE_COLLECT_METADATA)) 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, if (nla_put_u8(skb, IFLA_GENEVE_UDP_ZERO_CSUM6_RX,
!geneve->use_udp6_rx_checksums)) !geneve->use_udp6_rx_checksums))
goto nla_put_failure; goto nla_put_failure;
#endif
return 0; return 0;