]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: ipv6: exthdrs: get rid of ipv6_skb_net()
authorJustin Iurman <justin.iurman@uliege.be>
Fri, 8 Mar 2024 18:53:43 +0000 (19:53 +0100)
committerJakub Kicinski <kuba@kernel.org>
Mon, 11 Mar 2024 22:15:08 +0000 (15:15 -0700)
Get rid of ipv6_skb_net() which is only used in ipv6_hop_ioam().

Signed-off-by: Justin Iurman <justin.iurman@uliege.be>
Link: https://lore.kernel.org/r/20240308185343.39272-1-justin.iurman@uliege.be
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ipv6/exthdrs.c

index 25a5b394481b7de858a0cde8fae998f482449405..6789623b2b0d1db4d8c13dc505cb362c456c5160 100644 (file)
@@ -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;