diff options
| author | Emil Tantilov | 2012-10-24 10:12:10 +0200 |
|---|---|---|
| committer | Jeff Kirsher | 2012-11-01 10:00:10 +0100 |
| commit | 3af3361e6c25ea58c72c31efa9f0eb9f9bee4749 (patch) | |
| tree | 8dfcf89d191c81c4be33026583f9ae97b510c836 /drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | |
| parent | ixgbe: fix uninitialized event.type in ixgbe_ptp_check_pps_event (diff) | |
| download | kernel-qcow2-linux-3af3361e6c25ea58c72c31efa9f0eb9f9bee4749.tar.gz kernel-qcow2-linux-3af3361e6c25ea58c72c31efa9f0eb9f9bee4749.tar.xz kernel-qcow2-linux-3af3361e6c25ea58c72c31efa9f0eb9f9bee4749.zip | |
ixgbe: fix default setting of TXDCTL.WTHRESH
The q_vector->itr check in ixgbe_configure_tx_ring() was done prior to it
being set, which resulted in TXDCTL.WTHRESH always being set to 1 on driver
load, while consequent resets would set it to 8.
This patch moves the setting of q_vector->itr in ixgbe_alloc_q_vector() to
make sure that TXDCTL.WTHRESH is set to 8 by default.
Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c index 5e508b614dc3..8c74f739011d 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c @@ -824,6 +824,21 @@ static int ixgbe_alloc_q_vector(struct ixgbe_adapter *adapter, /* initialize pointer to rings */ ring = q_vector->ring; + /* intialize ITR */ + if (txr_count && !rxr_count) { + /* tx only vector */ + if (adapter->tx_itr_setting == 1) + q_vector->itr = IXGBE_10K_ITR; + else + q_vector->itr = adapter->tx_itr_setting; + } else { + /* rx or rx/tx vector */ + if (adapter->rx_itr_setting == 1) + q_vector->itr = IXGBE_20K_ITR; + else + q_vector->itr = adapter->rx_itr_setting; + } + while (txr_count) { /* assign generic ring traits */ ring->dev = &adapter->pdev->dev; |