aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ice/ice_main.c
diff options
context:
space:
mode:
authorAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>2018-12-19 13:03:27 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2019-01-15 14:11:10 -0500
commit03f7a986684597607de02f3023aa6c3657a78ab5 (patch)
treea68e18437a07c01c3f4a771941207a3f5dfbdb80 /drivers/net/ethernet/intel/ice/ice_main.c
parentab4ab73fc1ec6dec548fa36c5e383ef5faa7b4c1 (diff)
ice: Rework queue management code for reuse
This patch reworks the queue management code to allow for reuse with the XDP feature (to be added in a future patch). Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_main.c')
-rw-r--r--drivers/net/ethernet/intel/ice/ice_main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index e36db981f047..093708b5c0ef 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -2546,7 +2546,8 @@ static int ice_vsi_cfg(struct ice_vsi *vsi)
2546 if (err) 2546 if (err)
2547 return err; 2547 return err;
2548 } 2548 }
2549 err = ice_vsi_cfg_txqs(vsi); 2549
2550 err = ice_vsi_cfg_lan_txqs(vsi);
2550 if (!err) 2551 if (!err)
2551 err = ice_vsi_cfg_rxqs(vsi); 2552 err = ice_vsi_cfg_rxqs(vsi);
2552 2553
@@ -3040,7 +3041,8 @@ int ice_down(struct ice_vsi *vsi)
3040 } 3041 }
3041 3042
3042 ice_vsi_dis_irq(vsi); 3043 ice_vsi_dis_irq(vsi);
3043 tx_err = ice_vsi_stop_tx_rings(vsi, ICE_NO_RESET, 0); 3044
3045 tx_err = ice_vsi_stop_lan_tx_rings(vsi, ICE_NO_RESET, 0);
3044 if (tx_err) 3046 if (tx_err)
3045 netdev_err(vsi->netdev, 3047 netdev_err(vsi->netdev,
3046 "Failed stop Tx rings, VSI %d error %d\n", 3048 "Failed stop Tx rings, VSI %d error %d\n",