hulk inclusion category: bugfix bugzilla: https://atomgit.com/src-openeuler/kernel/issues/17648 CVE: CVE-2026-74264 -------------------------------- To maintain KABI stability, replace the direct addition of watchdog_lock and watchdog_ref_held in struct net_device with KABI_RESERVE(1) and KABI_RESERVE(2), respectively. This preserves the structure layout and ensures binary compatibility with external kernel modules on the target branch. Fixes: f12bf6f3f942 ("net: watchdog: add net device refcount tracker") Signed-off-by: JiangJieHua <jiangjiehua1@huawei.com> --- include/linux/netdevice.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index f50d39af3edbf..47a4e2cb94779 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2331,9 +2331,6 @@ struct net_device { /* These may be needed for future network-power-down code. */ struct timer_list watchdog_timer; int watchdog_timeo; - spinlock_t watchdog_lock; - bool watchdog_ref_held; - u32 proto_down_reason; struct list_head todo_list; @@ -2459,8 +2456,8 @@ struct net_device { #else KABI_RESERVE(1) #endif - KABI_RESERVE(2) - KABI_RESERVE(3) + KABI_RENAME(_KABI_RESERVE(2), spinlock_t watchdog_lock); + KABI_USE(3, bool watchdog_ref_held) KABI_RESERVE(4) KABI_RESERVE(5) KABI_RESERVE(6) -- 2.33.8