summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiwon Kim <jiwonaid0@gmail.com>2021-09-02 00:34:49 +0900
committerDavid S. Miller <davem@davemloft.net>2021-09-02 11:29:55 +0100
commit3f22bb137eb03ab27eaaa8b40d3e072eb541444e (patch)
tree0985dbcddf8f990c6091562caa5b652acdc02995
parent66abf5fb4cf713c6fdfccfbbabdcdf834f8bb9e2 (diff)
downloadlinux-stable-3f22bb137eb03ab27eaaa8b40d3e072eb541444e.tar.gz
linux-stable-3f22bb137eb03ab27eaaa8b40d3e072eb541444e.tar.bz2
linux-stable-3f22bb137eb03ab27eaaa8b40d3e072eb541444e.zip
ipv6: change return type from int to void for mld_process_v2
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>
-rw-r--r--net/ipv6/mcast.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index cd951faa2fac..bed8155508c8 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -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)