diff options
Diffstat (limited to 'drivers/net/net_failover.c')
| -rw-r--r-- | drivers/net/net_failover.c | 8 | 
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/net_failover.c b/drivers/net/net_failover.c index 7a28e082436e..d0c916a53d7c 100644 --- 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;  |