summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorParikh, Neerav <neerav.parikh@intel.com>2015-02-21 06:43:37 +0000
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2015-02-26 04:54:00 -0800
commitcd238a3ecf2bf7f3d1a155a32b4bddd87dbd3d23 (patch)
tree22b268e8d4361a8e9e2355a59d80efcdbbb658fc /drivers
parent7f9ff47683cb7441e6d0496365bcf64738f6d2d4 (diff)
downloadlinux-stable-cd238a3ecf2bf7f3d1a155a32b4bddd87dbd3d23.tar.gz
linux-stable-cd238a3ecf2bf7f3d1a155a32b4bddd87dbd3d23.tar.bz2
linux-stable-cd238a3ecf2bf7f3d1a155a32b4bddd87dbd3d23.zip
i40e: Fix the Tx ring qset handle when DCB reconfigures
When DCB is reconfigured to single TC the driver did not reset the Tx ring Qset handle to the correct mapping; which caused Tx queue disable timeouts. Change-ID: I4da5915ec92a83c281b478d653fae6ef1b72edfe Signed-off-by: Neerav Parikh <neerav.parikh@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_main.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index a926e3bf1d6d..bd4494d727a6 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -2689,8 +2689,15 @@ static void i40e_vsi_config_dcb_rings(struct i40e_vsi *vsi)
u16 qoffset, qcount;
int i, n;
- if (!(vsi->back->flags & I40E_FLAG_DCB_ENABLED))
- return;
+ if (!(vsi->back->flags & I40E_FLAG_DCB_ENABLED)) {
+ /* Reset the TC information */
+ for (i = 0; i < vsi->num_queue_pairs; i++) {
+ rx_ring = vsi->rx_rings[i];
+ tx_ring = vsi->tx_rings[i];
+ rx_ring->dcb_tc = 0;
+ tx_ring->dcb_tc = 0;
+ }
+ }
for (n = 0; n < I40E_MAX_TRAFFIC_CLASS; n++) {
if (!(vsi->tc_config.enabled_tc & (1 << n)))