]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: ipv6: ip6mr: Make ip6mr_forward2() void
authorPetr Machata <petrm@nvidia.com>
Mon, 16 Jun 2025 22:44:16 +0000 (00:44 +0200)
committerJakub Kicinski <kuba@kernel.org>
Wed, 18 Jun 2025 01:18:45 +0000 (18:18 -0700)
Nobody uses the return value, so convert the function to void.

Signed-off-by: Petr Machata <petrm@nvidia.com>
Link: https://patch.msgid.link/e0bee259da0da58da96647ea9e21e6360c8f7e11.1750113335.git.petrm@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ipv6/ip6mr.c

index 426859cd3409235ec47027758da894273cf3b318..41c348209e1b45edf90a3eda965bcfa1484be091 100644 (file)
@@ -2035,8 +2035,8 @@ static inline int ip6mr_forward2_finish(struct net *net, struct sock *sk, struct
  *     Processing handlers for ip6mr_forward
  */
 
-static int ip6mr_forward2(struct net *net, struct mr_table *mrt,
-                         struct sk_buff *skb, int vifi)
+static void ip6mr_forward2(struct net *net, struct mr_table *mrt,
+                          struct sk_buff *skb, int vifi)
 {
        struct vif_device *vif = &mrt->vif_table[vifi];
        struct net_device *indev = skb->dev;
@@ -2101,13 +2101,13 @@ static int ip6mr_forward2(struct net *net, struct mr_table *mrt,
 
        IP6CB(skb)->flags |= IP6SKB_FORWARDED;
 
-       return NF_HOOK(NFPROTO_IPV6, NF_INET_FORWARD,
-                      net, NULL, skb, indev, skb->dev,
-                      ip6mr_forward2_finish);
+       NF_HOOK(NFPROTO_IPV6, NF_INET_FORWARD,
+               net, NULL, skb, indev, skb->dev,
+               ip6mr_forward2_finish);
+       return;
 
 out_free:
        kfree_skb(skb);
-       return 0;
 }
 
 /* Called with rcu_read_lock() */