The commit is pushed to "branch-rh9-5.14.0-162.6.1.vz9.18.x-ovz" and will 
appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh9-5.14.0-162.6.1.vz9.18.2
------>
commit 0902e93723b17335036f4eb8570fe1122104c71e
Author: Menglong Dong <imaged...@tencent.com>
Date:   Tue Jan 3 17:39:43 2023 +0200

    net: skb: change the definition SKB_DR_SET()
    
    The SKB_DR_OR() is used to set the drop reason to a value when it is
    not set or specified yet. SKB_NOT_DROPPED_YET should also be considered
    as not set.
    
    Reviewed-by: Jiang Biao <benbji...@tencent.com>
    Reviewed-by: Hao Peng <flyingp...@tencent.com>
    Signed-off-by: Menglong Dong <imaged...@tencent.com>
    Signed-off-by: David S. Miller <da...@davemloft.net>
    Acked-by: Nikolay Borisov <nbori...@suse.com>
    Signed-off-by: Nikolay Borisov <nikolay.bori...@virtuozzo.com>
    
    ======
    Patchset description:
    ms/net: Annotate skb free sites with reason
    
    This series backports most of the patches that add a reason to skb free 
sites.
    
    https://jira.sw.ru/browse/PSBM-143302
    
    Feature: net: improve verbosity of dropped packets reporting
---
 include/linux/skbuff.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 8860e9126f95..764161493f22 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -478,7 +478,8 @@ enum skb_drop_reason {
        (name = SKB_DROP_REASON_##reason)
 #define SKB_DR_OR(name, reason)                                        \
        do {                                                    \
-               if (name == SKB_DROP_REASON_NOT_SPECIFIED)      \
+               if (name == SKB_DROP_REASON_NOT_SPECIFIED ||    \
+                   name == SKB_NOT_DROPPED_YET)                \
                        SKB_DR_SET(name, reason);               \
        } while (0)
 
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel

Reply via email to