]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ipv6: mcast: Simplify mld_clear_{report|query}()
authorYue Haibing <yuehaibing@huawei.com>
Tue, 15 Jul 2025 12:07:09 +0000 (20:07 +0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 16 Jul 2025 23:14:42 +0000 (16:14 -0700)
Use __skb_queue_purge() instead of re-implementing it. Note that it uses
kfree_skb_reason() instead of kfree_skb() internally, and pass
SKB_DROP_REASON_QUEUE_PURGE drop reason to the kfree_skb tracepoint.

Signed-off-by: Yue Haibing <yuehaibing@huawei.com>
Reviewed-by: Hangbin Liu <liuhangbin@gmail.com>
Link: https://patch.msgid.link/20250715120709.3941510-1-yuehaibing@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ipv6/mcast.c

index d3ecb5596b74cdeefd362d6ef3199f3e91584e26..0c63c33ab0800740442a4a653a77f9f172e1dfbe 100644 (file)
@@ -845,21 +845,15 @@ static void mld_clear_delrec(struct inet6_dev *idev)
 
 static void mld_clear_query(struct inet6_dev *idev)
 {
-       struct sk_buff *skb;
-
        spin_lock_bh(&idev->mc_query_lock);
-       while ((skb = __skb_dequeue(&idev->mc_query_queue)))
-               kfree_skb(skb);
+       __skb_queue_purge(&idev->mc_query_queue);
        spin_unlock_bh(&idev->mc_query_lock);
 }
 
 static void mld_clear_report(struct inet6_dev *idev)
 {
-       struct sk_buff *skb;
-
        spin_lock_bh(&idev->mc_report_lock);
-       while ((skb = __skb_dequeue(&idev->mc_report_queue)))
-               kfree_skb(skb);
+       __skb_queue_purge(&idev->mc_report_queue);
        spin_unlock_bh(&idev->mc_report_lock);
 }