1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 3ad4f501949e..a93d9417dc15 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4341,11 +4341,18 @@ static u16 bond_select_queue(struct net_device *dev, struct sk_buff *skb)
 {
         /*
          * This helper function exists to help dev_pick_tx get the correct
-         * destination queue.  Using a helper function skips the a call to
+         * destination queue.  Using a helper function skips a call to
          * skb_tx_hash and will put the skbs in the queue we expect on their
          * way down to the bonding driver.
          */
-        return skb->queue_mapping;
+        u16 txq = skb_rx_queue_recorded(skb) ? skb_get_rx_queue(skb) : 0;
+
+        if (unlikely(txq >= dev->real_num_tx_queues)) {
+                do
+                        txq -= dev->real_num_tx_queues;
+                while (txq >= dev->real_num_tx_queues);
+        }
+        return txq;
 }
 
 static netdev_tx_t bond_start_xmit(struct sk_buff *skb, struct net_device *dev)