net/mlx5: Include linux/pci.h for pci_msix_can_alloc_dyn()

[linux-block.git] / drivers / net / net_failover.c

diff --git a/drivers/net/net_failover.c b/drivers/net/net_failover.c
index 7a28e082436e4a3a5a9e11a3711b666e5735c406..d0c916a53d7ce4689e51eeffdfdaa5dd997ae529 100644 (file)
--- a/drivers/net/net_failover.c
+++ b/drivers/net/net_failover.c
@@ -130,14 +130,10 @@ static u16 net_failover_select_queue(struct net_device *dev,
                        txq = ops->ndo_select_queue(primary_dev, skb, sb_dev);
                else
                        txq = netdev_pick_tx(primary_dev, skb, NULL);
-
-               qdisc_skb_cb(skb)->slave_dev_queue_mapping = skb->queue_mapping;
-
-               return txq;
+       } else {
+               txq = skb_rx_queue_recorded(skb) ? skb_get_rx_queue(skb) : 0;
        }
 
-       txq = skb_rx_queue_recorded(skb) ? skb_get_rx_queue(skb) : 0;
-
        /* Save the original txq to restore before passing to the driver */
        qdisc_skb_cb(skb)->slave_dev_queue_mapping = skb->queue_mapping;