]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ipv6: change return type from int to void for mld_process_v2
authorJiwon Kim <jiwonaid0@gmail.com>
Wed, 1 Sep 2021 15:34:49 +0000 (00:34 +0900)
committerDavid S. Miller <davem@davemloft.net>
Thu, 2 Sep 2021 10:29:55 +0000 (11:29 +0100)
The mld_process_v2 only returned 0.

So, the return type is changed to void.

Signed-off-by: Jiwon Kim <jiwonaid0@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/mcast.c

index cd951faa2fac18614c937c2ff0bea8ba32463d74..bed8155508c85c2beee109468726b33d56191801 100644 (file)
@@ -1356,8 +1356,8 @@ static int mld_process_v1(struct inet6_dev *idev, struct mld_msg *mld,
        return 0;
 }
 
-static int mld_process_v2(struct inet6_dev *idev, struct mld2_query *mld,
-                         unsigned long *max_delay)
+static void mld_process_v2(struct inet6_dev *idev, struct mld2_query *mld,
+                          unsigned long *max_delay)
 {
        *max_delay = max(msecs_to_jiffies(mldv2_mrc(mld)), 1UL);
 
@@ -1367,7 +1367,7 @@ static int mld_process_v2(struct inet6_dev *idev, struct mld2_query *mld,
 
        idev->mc_maxdelay = *max_delay;
 
-       return 0;
+       return;
 }
 
 /* called with rcu_read_lock() */
@@ -1454,9 +1454,7 @@ static void __mld_query_work(struct sk_buff *skb)
 
                mlh2 = (struct mld2_query *)skb_transport_header(skb);
 
-               err = mld_process_v2(idev, mlh2, &max_delay);
-               if (err < 0)
-                       goto out;
+               mld_process_v2(idev, mlh2, &max_delay);
 
                if (group_type == IPV6_ADDR_ANY) { /* general query */
                        if (mlh2->mld2q_nsrcs)