|
|
|
@ -175,6 +175,14 @@ static struct macvtap_queue *macvtap_get_queue(struct net_device *dev, |
|
|
|
|
if (!numvtaps) |
|
|
|
|
goto out; |
|
|
|
|
|
|
|
|
|
/* Check if we can use flow to select a queue */ |
|
|
|
|
rxq = skb_get_rxhash(skb); |
|
|
|
|
if (rxq) { |
|
|
|
|
tap = rcu_dereference(vlan->taps[rxq % numvtaps]); |
|
|
|
|
if (tap) |
|
|
|
|
goto out; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (likely(skb_rx_queue_recorded(skb))) { |
|
|
|
|
rxq = skb_get_rx_queue(skb); |
|
|
|
|
|
|
|
|
@ -186,14 +194,6 @@ static struct macvtap_queue *macvtap_get_queue(struct net_device *dev, |
|
|
|
|
goto out; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/* Check if we can use flow to select a queue */ |
|
|
|
|
rxq = skb_get_rxhash(skb); |
|
|
|
|
if (rxq) { |
|
|
|
|
tap = rcu_dereference(vlan->taps[rxq % numvtaps]); |
|
|
|
|
if (tap) |
|
|
|
|
goto out; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/* Everything failed - find first available queue */ |
|
|
|
|
for (rxq = 0; rxq < MAX_MACVTAP_QUEUES; rxq++) { |
|
|
|
|
tap = rcu_dereference(vlan->taps[rxq]); |
|
|
|
|