2024-03-08 19:03:53

by Justin Iurman

Subject: [PATCH net-next] net: ipv6: exthdrs: get rid of ipv6_skb_net()

Get rid of ipv6_skb_net() which is only used in ipv6_hop_ioam().

Signed-off-by: Justin Iurman <[email protected]>
---
net/ipv6/exthdrs.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index 25a5b394481b..6789623b2b0d 100644
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -883,14 +883,6 @@ void ipv6_exthdrs_exit(void)
Hop-by-hop options.
**********************************/

-/*
- * Note: we cannot rely on skb_dst(skb) before we assign it in ip6_route_input().
- */
-static inline struct net *ipv6_skb_net(struct sk_buff *skb)
-{
- return skb_dst(skb) ? dev_net(skb_dst(skb)->dev) : dev_net(skb->dev);
-}
-
/* Router Alert as of RFC 2711 */

static bool ipv6_hop_ra(struct sk_buff *skb, int optoff)
@@ -941,7 +933,7 @@ static bool ipv6_hop_ioam(struct sk_buff *skb, int optoff)
goto drop;

/* Ignore if the IOAM namespace is unknown */
- ns = ioam6_namespace(ipv6_skb_net(skb), trace->namespace_id);
+ ns = ioam6_namespace(dev_net(skb->dev), trace->namespace_id);
if (!ns)
goto ignore;

--
2.34.1

2024-03-11 22:51:29

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net-next] net: ipv6: exthdrs: get rid of ipv6_skb_net()

Hello:

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

On Fri, 8 Mar 2024 19:53:43 +0100 you wrote:
> Get rid of ipv6_skb_net() which is only used in ipv6_hop_ioam().
>
> Signed-off-by: Justin Iurman <[email protected]>
> ---
> net/ipv6/exthdrs.c | 10 +---------
> 1 file changed, 1 insertion(+), 9 deletions(-)

Here is the summary with links:
- [net-next] net: ipv6: exthdrs: get rid of ipv6_skb_net()
https://git.kernel.org/netdev/net-next/c/fcac05daa7ef

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html