hulk inclusion category: bugfix bugzilla: https://atomgit.com/openeuler/kernel/issues/9726 -------------------------------- commit 4d25ca2d6801 rename mono_delivery_time to tstamp_type for scalabilty, which lead to kabi breakage. . Fixes: 4d25ca2d6801 ("net: Rename mono_delivery_time to tstamp_type for scalabilty") Signed-off-by: Dong Chenchen <dongchenchen2@huawei.com> --- include/linux/skbuff.h | 6 +++++- include/net/inet_frag.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index c4dc39b5b025..61fcdbf8186b 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -942,7 +942,11 @@ struct sk_buff { /* private: */ __u8 __mono_tc_offset[0]; /* public: */ - __u8 tstamp_type:1; /* See skb_tstamp_type */ +#ifndef __GENKSYMS__ + __u8 tstamp_type:1; /* See skb_tstamp_type */ +#else + __u8 mono_delivery_time:1; /* See SKB_MONO_DELIVERY_TIME_MASK */ +#endif #ifdef CONFIG_NET_XGRESS __u8 tc_at_ingress:1; /* See TC_AT_INGRESS_MASK */ __u8 tc_skip_classify:1; diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h index 0313bc955afe..6c2e39d34d57 100644 --- a/include/net/inet_frag.h +++ b/include/net/inet_frag.h @@ -98,7 +98,7 @@ struct inet_frag_queue { ktime_t stamp; int len; int meat; - u8 tstamp_type; + KABI_REPLACE(u8 mono_delivery_time, u8 tstamp_type) __u8 flags; u16 max_size; struct fqdir *fqdir; -- 2.25.1