2 files changed, 14 insertions, 10 deletions

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
index cfe5a6af04d0..b3c282d09b18 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
@@ -619,6 +619,10 @@ static bool ixgbe_set_sriov_queues(struct ixgbe_adapter *adapter)
         }
 
 #endif
+        /* populate TC0 for use by pool 0 */
+        netdev_set_tc_queue(adapter->netdev, 0,
+                            adapter->num_rx_queues_per_pool, 0);
+
         return true;
 }
 
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index cdb8502ae473..d8c4c1b90378 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -6571,20 +6571,12 @@ int ixgbe_open(struct net_device *netdev)
                 goto err_req_irq;
 
         /* Notify the stack of the actual queue counts. */
-        if (adapter->num_rx_pools > 1)
-                queues = adapter->num_rx_queues_per_pool;
-        else
-                queues = adapter->num_tx_queues;
-
+        queues = adapter->num_tx_queues;
         err = netif_set_real_num_tx_queues(netdev, queues);
         if (err)
                 goto err_set_queues;
 
-        if (adapter->num_rx_pools > 1 &&
-            adapter->num_rx_queues > IXGBE_MAX_L2A_QUEUES)
-                queues = IXGBE_MAX_L2A_QUEUES;
-        else
-                queues = adapter->num_rx_queues;
+        queues = adapter->num_rx_queues;
         err = netif_set_real_num_rx_queues(netdev, queues);
         if (err)
                 goto err_set_queues;
@@ -8814,6 +8806,14 @@ 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;