[PATCH net-next] net: libwx: rename wx_pf_flags to wx_flags
Jiawen Wu <[email protected]>
| Newsgroups | org.kernel.vger.netdev |
|---|---|
| Message-ID | <[email protected]> |
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 <[email protected]> --- drivers/net/ethernet/wangxun/libwx/wx_hw.c | 2 +- drivers/net/ethernet/wangxun/libwx/wx_ptp.c | 2 +- drivers/net/ethernet/wangxun/libwx/wx_type.h | 6 +++--- 3 files changed, 5 insertions(+), 5 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_ptp.c b/drivers/net/ethernet/wangxun/libwx/wx_ptp.c index 3eea647c4742..e35e854652ec 100644 --- a/drivers/net/ethernet/wangxun/libwx/wx_ptp.c +++ b/drivers/net/ethernet/wangxun/libwx/wx_ptp.c @@ -558,7 +558,7 @@ static int wx_ptp_set_timestamp_mode(struct wx *wx, { u32 tsync_tx_ctl = WX_TSC_1588_CTL_ENABLED; u32 tsync_rx_ctl = WX_PSR_1588_CTL_ENABLED; - DECLARE_BITMAP(flags, WX_PF_FLAGS_NBITS); + DECLARE_BITMAP(flags, WX_FLAGS_NBITS); u32 tsync_rx_mtrl = PTP_EV_PORT << 16; bool is_l2 = false; u32 regval; diff --git a/drivers/net/ethernet/wangxun/libwx/wx_type.h b/drivers/net/ethernet/wangxun/libwx/wx_type.h index 2eba5ab59925..39cec52c3d2f 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; -- 2.51.0