Skip to contentSkip to conversation

ipv4: remove sparse error in ip_neigh_gw4()

PATCH Applied Eric Dumazet 3 participants 3 messages Jan 27, 2022

Subsystems (3)
Networking Network drivers IPv4/IPv6
lore
Share & tools
lore

Eric Dumazet

author
#0 lore raw

PATCH 1/1 ipv4: remove sparse error in ip_neigh_gw4()

From: Eric Dumazet <[email protected]>

./include/net/route.h:373:48: warning: incorrect type in argument 2 (different base types)
./include/net/route.h:373:48: expected unsigned int [usertype] key
./include/net/route.h:373:48: got restricted __be32 [usertype] daddr

Fixes 5c9f7c1dfc2e ("ipv4: Add helpers for neigh lookup for nexthop")
Signed-off-by Eric Dumazet <[email protected]>
Cc David Ahern <[email protected]>
---
 include/net/route.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/route.h +1 -1
index 4c858dcf1aa8cd1988746e55eb698ad4425fd77b..25404fc2b48374c69081b8c72c2ea1dbbc09ed7f 100644
@@ -370,7 +370,7 @@ static inline struct neighbour *ip_neigh_gw4(struct net_device *dev,
 {
 	struct neighbour *neigh;
 
-	neigh = __ipv4_neigh_lookup_noref(dev, daddr);
+	neigh = __ipv4_neigh_lookup_noref(dev, (__force u32)daddr);
 	if (unlikely(!neigh))
 		neigh = __neigh_create(&arp_tbl, &daddr, dev, false);
Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
Reviewed-by on v1 1/1
#1 lore raw
Quoted 18 lines · Eric Dumazet

From: Eric Dumazet <[email protected]>

./include/net/route.h:373:48: warning: incorrect type in argument 2 (different base types)
./include/net/route.h:373:48: expected unsigned int [usertype] key
./include/net/route.h:373:48: got restricted __be32 [usertype] daddr

Fixes 5c9f7c1dfc2e ("ipv4: Add helpers for neigh lookup for nexthop")
Signed-off-by Eric Dumazet <[email protected]>
Cc David Ahern <[email protected]>
---
 include/net/route.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/route.h +0 -0
index 4c858dcf1aa8cd1988746e55eb698ad4425fd77b..25404fc2b48374c69081b8c72c2ea1dbbc09ed7f 100644

include/net/route.h static inline struct neighbour *ip_neigh_gw4(struct net_device *dev, · line 376

Quoted 8 lines
include/net/route.h +1 -1
@@ -370,7 +370,7 @@ static inline struct neighbour *ip_neigh_gw4(struct net_device *dev,
 {
 	struct neighbour *neigh;
 
-	neigh = __ipv4_neigh_lookup_noref(dev, daddr);
+	neigh = __ipv4_neigh_lookup_noref(dev, (__force u32)daddr);
 	if (unlikely(!neigh))
 		neigh = __neigh_create(&arp_tbl, &daddr, dev, false);

I think __ipv4_neigh_lookup_noref can be changed to __be32 and remove the (__force u32) from a couple of callers, but more like net-next material.

Reviewed-by David Ahern <[email protected]>
CI Applied
#2 lore raw
In reply to Eric Dumazet
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:

Quoted 11 lines · On Wed, 26 Jan 2022 17:34:04 -0800 you wrote:

From: Eric Dumazet <[email protected]>

./include/net/route.h:373:48: warning: incorrect type in argument 2 (different base types)
./include/net/route.h:373:48: expected unsigned int [usertype] key
./include/net/route.h:373:48: got restricted __be32 [usertype] daddr

Fixes 5c9f7c1dfc2e ("ipv4: Add helpers for neigh lookup for nexthop")
Signed-off-by Eric Dumazet <[email protected]>
Cc David Ahern <[email protected]>

[...]

Here is the summary with links:
- [net] ipv4: remove sparse error in ip_neigh_gw4()

    https://git.kernel.org/netdev/net/c/3c42b2019863

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html