summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiawen Wu <jiawenwu@trustnetic.com>2025-08-21 10:34:07 +0800
committerJakub Kicinski <kuba@kernel.org>2025-08-22 17:07:49 -0700
commit5f43f2171abb4ad326f861ea3f00b7d0afbf6675 (patch)
treed815a3f889d35bec15e4dd7186a8bf6207a8bb63
parentfd4aa243f154a80bbeb3dd311d2114eeb538f479 (diff)
net: wangxun: cleanup the code in wx_set_coalesce()
Cleanup the code for the next patch to add adaptive RX coalesce. Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com> Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> Link: https://patch.msgid.link/20250821023408.53472-4-jiawenwu@trustnetic.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-rw-r--r--drivers/net/ethernet/wangxun/libwx/wx_ethtool.c28
1 files changed, 8 insertions, 20 deletions
diff --git a/drivers/net/ethernet/wangxun/libwx/wx_ethtool.c b/drivers/net/ethernet/wangxun/libwx/wx_ethtool.c
index 590a5901cf77..c7b3f5087b66 100644
--- a/drivers/net/ethernet/wangxun/libwx/wx_ethtool.c
+++ b/drivers/net/ethernet/wangxun/libwx/wx_ethtool.c
@@ -343,13 +343,19 @@ int wx_set_coalesce(struct net_device *netdev,
switch (wx->mac.type) {
case wx_mac_sp:
max_eitr = WX_SP_MAX_EITR;
+ rx_itr_param = WX_20K_ITR;
+ tx_itr_param = WX_12K_ITR;
break;
case wx_mac_aml:
case wx_mac_aml40:
max_eitr = WX_AML_MAX_EITR;
+ rx_itr_param = WX_20K_ITR;
+ tx_itr_param = WX_12K_ITR;
break;
default:
max_eitr = WX_EM_MAX_EITR;
+ rx_itr_param = WX_7K_ITR;
+ tx_itr_param = WX_7K_ITR;
break;
}
@@ -362,34 +368,16 @@ int wx_set_coalesce(struct net_device *netdev,
else
wx->rx_itr_setting = ec->rx_coalesce_usecs;
- if (wx->rx_itr_setting == 1) {
- if (wx->mac.type == wx_mac_em)
- rx_itr_param = WX_7K_ITR;
- else
- rx_itr_param = WX_20K_ITR;
- } else {
+ if (wx->rx_itr_setting != 1)
rx_itr_param = wx->rx_itr_setting;
- }
if (ec->tx_coalesce_usecs > 1)
wx->tx_itr_setting = ec->tx_coalesce_usecs << 2;
else
wx->tx_itr_setting = ec->tx_coalesce_usecs;
- if (wx->tx_itr_setting == 1) {
- switch (wx->mac.type) {
- case wx_mac_sp:
- case wx_mac_aml:
- case wx_mac_aml40:
- tx_itr_param = WX_12K_ITR;
- break;
- default:
- tx_itr_param = WX_7K_ITR;
- break;
- }
- } else {
+ if (wx->tx_itr_setting != 1)
tx_itr_param = wx->tx_itr_setting;
- }
/* mixed Rx/Tx */
if (wx->q_vector[0]->tx.count && wx->q_vector[0]->rx.count)