X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=drivers%2Fnet%2Fmacvtap.c;h=58dc117a8d781b93ba91a258fe87de1e3bf5a7c8;hb=ac69e0928054ff29a5049902fb477f9c7605c773;hp=7c88d136e72353f13c926fd1437d49fa0bacb54e;hpb=9f6e20cee6253c4ca5faacba8dbd09ebe70132ed;p=karo-tx-linux.git diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 7c88d136e723..58dc117a8d78 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -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]);