From 7042c8c193e5d634198b7c766bb3a01c8e3ee0e2 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Tue, 1 Sep 2026 14:56:59 +0800 Subject: [PATCH] net: libwx: rename wx_pf_flags to wx_flags The flags defined in `enum wx_pf_flags` and its terminator `WX_PF_FLAGS_NBITS` were originally named with a "PF" (Physical Function) prefix. However, these flags are not exclusive to PFs and are also utilized by Virtual Functions (VFs). Rename the enumeration to `enum wx_flags` and the bit count to `WX_FLAGS_NBITS` to accurately reflect their shared usage across both PF and VF drivers, and to prevent potential confusion. Signed-off-by: Jiawen Wu Reviewed-by: Breno Leitao Link: https://patch.msgid.link/9479B0506F544556+20260901065659.41273-1-jiawenwu@trustnetic.com Signed-off-by: Paolo Abeni --- drivers/net/ethernet/wangxun/libwx/wx_hw.c | 2 +- drivers/net/ethernet/wangxun/libwx/wx_type.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/wangxun/libwx/wx_hw.c b/drivers/net/ethernet/wangxun/libwx/wx_hw.c index 122c4952d203..59cdd7d71e44 100644 --- a/drivers/net/ethernet/wangxun/libwx/wx_hw.c +++ b/drivers/net/ethernet/wangxun/libwx/wx_hw.c @@ -2520,7 +2520,7 @@ int wx_sw_init(struct wx *wx) spin_lock_init(&wx->hw_stats_lock); mutex_init(&wx->reset_lock); bitmap_zero(wx->state, WX_STATE_NBITS); - bitmap_zero(wx->flags, WX_PF_FLAGS_NBITS); + bitmap_zero(wx->flags, WX_FLAGS_NBITS); set_bit(WX_STATE_DOWN, wx->state); wx->misc_irq_domain = false; diff --git a/drivers/net/ethernet/wangxun/libwx/wx_type.h b/drivers/net/ethernet/wangxun/libwx/wx_type.h index 9454e90258d8..a05a8c1f4049 100644 --- a/drivers/net/ethernet/wangxun/libwx/wx_type.h +++ b/drivers/net/ethernet/wangxun/libwx/wx_type.h @@ -1269,7 +1269,7 @@ struct wx_rss_flow_map { u8 flag; }; -enum wx_pf_flags { +enum wx_flags { WX_FLAG_MULTI_64_FUNC, WX_FLAG_SWFW_RING, WX_FLAG_VMDQ_ENABLED, @@ -1291,13 +1291,13 @@ enum wx_pf_flags { WX_FLAG_RX_MERGE_ENABLED, WX_FLAG_TXHEAD_WB_ENABLED, WX_FLAG_NEED_PCIE_RECOVERY, - WX_PF_FLAGS_NBITS /* must be last */ + WX_FLAGS_NBITS /* must be last */ }; struct wx { unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)]; DECLARE_BITMAP(state, WX_STATE_NBITS); - DECLARE_BITMAP(flags, WX_PF_FLAGS_NBITS); + DECLARE_BITMAP(flags, WX_FLAGS_NBITS); void *priv; u8 __iomem *hw_addr;