Skip to contentSkip to conversation

geneve: use ipv6_mod_enabled to check if ipv6 is disabled

PATCH In review Hangbin Liu 3 participants 3 messages Feb 25, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 geneve: use ipv6_mod_enabled to check if ipv6 is disabled

ipv6_mod_enabled() is more safe and gentle to check if ipv6 is disabled at running time.

Fixes c0a47e44c098 ("geneve: should not call rt6_lookup() when ipv6 was disabled")
---
 drivers/net/geneve.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/geneve.c +1 -1
index 3377ac66a347..42c5e43ece68 100644
@@ -1514,7 +1514,7 @@ static void geneve_link_config(struct net_device *dev,
 	case AF_INET6: {
 		struct rt6_info *rt;
 
-		if (!__in6_dev_get(dev))
+		if (!ipv6_mod_enabled())
 			break;
 
 		rt = rt6_lookup(geneve->net, &info->key.u.ipv6.dst, NULL, 0,
Signature · 1 line
2.19.2
#1 lore raw
Quoted 15 lines · Hangbin Liu

ipv6_mod_enabled() is more safe and gentle to check if ipv6 is disabled at running time.

Fixes c0a47e44c098 ("geneve: should not call rt6_lookup() when ipv6 was disabled")
---
 drivers/net/geneve.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/geneve.c +0 -0
index 3377ac66a347..42c5e43ece68 100644

drivers/net/geneve.c static void geneve_link_config(struct net_device *dev, · line 1520

Quoted 8 lines
drivers/net/geneve.c +1 -1
@@ -1514,7 +1514,7 @@ static void geneve_link_config(struct net_device *dev,
 	case AF_INET6: {
 		struct rt6_info *rt;
 
-		if (!__in6_dev_get(dev))
+		if (!ipv6_mod_enabled())
 			break;
 
 		rt = rt6_lookup(geneve->net, &info->key.u.ipv6.dst, NULL, 0,

seems to me the existing check is more appropriate and relevant for the code path: is ipv6 enabled on this device versus is ipv6 enabled at all.

maintainer
#2 lore raw

From: David Ahern <[email protected]>
Date: Mon, 25 Feb 2019 09:57:08 -0700

Quoted 22 lines · Hangbin Liu
Quoted 21 lines

ipv6_mod_enabled() is more safe and gentle to check if ipv6 is disabled at running time.

Fixes c0a47e44c098 ("geneve: should not call rt6_lookup() when ipv6 was disabled")
---
 drivers/net/geneve.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/geneve.c +1 -1
index 3377ac66a347..42c5e43ece68 100644
@@ -1514,7 +1514,7 @@ static void geneve_link_config(struct net_device *dev,
 	case AF_INET6: {
 		struct rt6_info *rt;
 
-		if (!__in6_dev_get(dev))
+		if (!ipv6_mod_enabled())
 			break;
 
Quoted 5 lines

drivers/net/geneve.c static void geneve_link_config(struct net_device *dev, · line 1520

Quoted 2 lines
drivers/net/geneve.c +0 -0
 		rt = rt6_lookup(geneve->net, &info->key.u.ipv6.dst, NULL, 0,

seems to me the existing check is more appropriate and relevant for the code path: is ipv6 enabled on this device versus is ipv6 enabled at all.

Agreed.