diff options
| -rw-r--r-- | drivers/net/ethernet/wangxun/libwx/wx_ethtool.c | 12 | ||||
| -rw-r--r-- | drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 5 |
2 files changed, 10 insertions, 7 deletions
diff --git a/drivers/net/ethernet/wangxun/libwx/wx_ethtool.c b/drivers/net/ethernet/wangxun/libwx/wx_ethtool.c index c12a4cb951f6..d9412e55b5b2 100644 --- a/drivers/net/ethernet/wangxun/libwx/wx_ethtool.c +++ b/drivers/net/ethernet/wangxun/libwx/wx_ethtool.c @@ -359,10 +359,14 @@ int wx_set_coalesce(struct net_device *netdev, else wx->rx_itr_setting = ec->rx_coalesce_usecs; - if (wx->rx_itr_setting == 1) - rx_itr_param = WX_20K_ITR; - else + 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 { rx_itr_param = wx->rx_itr_setting; + } if (ec->tx_coalesce_usecs > 1) wx->tx_itr_setting = ec->tx_coalesce_usecs << 2; @@ -377,7 +381,7 @@ int wx_set_coalesce(struct net_device *netdev, tx_itr_param = WX_12K_ITR; break; default: - tx_itr_param = WX_20K_ITR; + tx_itr_param = WX_7K_ITR; break; } } else { diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c index e0fc897b0a58..3fff73ae44af 100644 --- a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c +++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c @@ -119,9 +119,8 @@ static int ngbe_sw_init(struct wx *wx) num_online_cpus()); wx->rss_enabled = true; - /* enable itr by default in dynamic mode */ - wx->rx_itr_setting = 1; - wx->tx_itr_setting = 1; + wx->rx_itr_setting = WX_7K_ITR; + wx->tx_itr_setting = WX_7K_ITR; /* set default ring sizes */ wx->tx_ring_count = NGBE_DEFAULT_TXD; |