From: Yue Haibing Date: Tue, 15 Jul 2025 12:07:09 +0000 (+0800) Subject: ipv6: mcast: Simplify mld_clear_{report|query}() X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c628ed95e1b41f98766268593196adb7a0cb9a7;p=thirdparty%2Flinux.git ipv6: mcast: Simplify mld_clear_{report|query}() 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 Reviewed-by: Hangbin Liu Link: https://patch.msgid.link/20250715120709.3941510-1-yuehaibing@huawei.com Signed-off-by: Jakub Kicinski --- diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index d3ecb5596b74c..0c63c33ab0800 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -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); }