diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2017-11-22 10:56:34 -0800 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2018-01-09 08:47:12 -0800 |
| commit | ff815fb2cf638e0906764c9e0f66bc93703626f1 (patch) | |
| tree | a43f8fe56a40abef98398c95a90f9866139ea996 /drivers/net/ethernet | |
| parent | 2af62c56146d4be8bddc522ca75dae8234f5ac32 (diff) | |
| download | linux-ff815fb2cf638e0906764c9e0f66bc93703626f1.tar.bz2 | |
ixgbe: There is no need to update num_rx_pools in L2 fwd offload
The num_rx_pools value is overwritten when we reinitialize the queue
configuration. In reality we shouldn't need to be updating the value since
it is redone every time we call into ixgbe_setup_tc so for now just drop
the spots where we were incrementing or decrementing the value.
Signed-off-by: Alexander Duyck <alexander.h.duyck@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')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c index 8e2a957aca18..56622adc76dc 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c @@ -701,7 +701,7 @@ static void ixgbe_set_num_queues(struct ixgbe_adapter *adapter) adapter->num_rx_queues = 1; adapter->num_tx_queues = 1; adapter->num_xdp_queues = 0; - adapter->num_rx_pools = adapter->num_rx_queues; + adapter->num_rx_pools = 1; adapter->num_rx_queues_per_pool = 1; #ifdef CONFIG_IXGBE_DCB diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 5ccc3b6ccab1..4efb2b078f20 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -9843,7 +9843,6 @@ static void *ixgbe_fwd_add(struct net_device *pdev, struct net_device *vdev) return ERR_PTR(-ENOMEM); pool = find_first_zero_bit(&adapter->fwd_bitmask, 32); - adapter->num_rx_pools++; set_bit(pool, &adapter->fwd_bitmask); limit = find_last_bit(&adapter->fwd_bitmask, 32); @@ -9872,7 +9871,6 @@ fwd_add_err: netdev_info(pdev, "%s: dfwd hardware acceleration failed\n", vdev->name); clear_bit(pool, &adapter->fwd_bitmask); - adapter->num_rx_pools--; kfree(fwd_adapter); return ERR_PTR(err); } @@ -9884,7 +9882,6 @@ static void ixgbe_fwd_del(struct net_device *pdev, void *priv) unsigned int limit; clear_bit(fwd_adapter->pool, &adapter->fwd_bitmask); - adapter->num_rx_pools--; limit = find_last_bit(&adapter->fwd_bitmask, 32); adapter->ring_feature[RING_F_VMDQ].limit = limit + 1; |