ixgbe: Fix setting of TC configuration for macvlan case (646bb57c) · Commits · e / devices / android_kernel_teracube_emerald

When we were enabling macvlan interfaces we weren't correctly configuring things until ixgbe_setup_tc was called a second time either by tweaking the number of queues or increasing the macvlan count past 15. The issue came down to the fact that num_rx_pools is not populated until after the queues and interrupts are reinitialized. Instead of trying to set it sooner we can just move the call to setup at least 1 traffic class to the SR-IOV/VMDq setup function so that we just set it for this one case. We already had a spot that was configuring the queues for TC 0 in the code here anyway so it makes sense to also set the number of TCs here as well. Fixes: ("ixgbe: Fix handling of macvlan Tx offload") 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>

drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -593,6 +593,14 @@ static bool ixgbe_set_sriov_queues(struct ixgbe_adapter *adapter)
		}

		#endif
		/* To support macvlan offload we have to use num_tc to
		* restrict the queues that can be used by the device.
		* By doing this we can avoid reporting a false number of
		* queues.
		*/
		if (vmdq_i > 1)
		netdev_set_num_tc(adapter->netdev, 1);

		/* populate TC0 for use by pool 0 */
		netdev_set_tc_queue(adapter->netdev, 0,
		adapter->num_rx_queues_per_pool, 0);

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -8822,14 +8822,6 @@ int ixgbe_setup_tc(struct net_device *dev, u8 tc)
		} else {
		netdev_reset_tc(dev);

		/* To support macvlan offload we have to use num_tc to
		* restrict the queues that can be used by the device.
		* By doing this we can avoid reporting a false number of
		* queues.
		*/
		if (!tc && adapter->num_rx_pools > 1)
		netdev_set_num_tc(dev, 1);

		if (adapter->hw.mac.type == ixgbe_mac_82598EB)
		adapter->hw.fc.requested_mode = adapter->last_lfc_mode;