aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/xen-netback/interface.c
diff options
context:
space:
mode:
authorIngo Molnar <[email protected]>2018-10-08 10:40:34 +0200
committerIngo Molnar <[email protected]>2018-10-08 10:40:34 +0200
commitedfbeecd92b0c4a648ed96a7e255bfc9a1bc4642 (patch)
treeefdfc57e2520886842a27f2c9978c83d968ba709 /drivers/net/xen-netback/interface.c
parentc808c09b527cd60d9a0d53799935f75e2452174d (diff)
parentfb1c592cf4c9eeb84ec6bce13c13c11c7d05b6c7 (diff)
Merge branch 'linus' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'drivers/net/xen-netback/interface.c')
-rw-r--r--drivers/net/xen-netback/interface.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
index 92274c237200..f6ae23fc3f6b 100644
--- a/drivers/net/xen-netback/interface.c
+++ b/drivers/net/xen-netback/interface.c
@@ -162,7 +162,8 @@ static u16 xenvif_select_queue(struct net_device *dev, struct sk_buff *skb,
if (size == 0)
return skb_get_hash_raw(skb) % dev->real_num_tx_queues;
- return vif->hash.mapping[skb_get_hash_raw(skb) % size];
+ return vif->hash.mapping[vif->hash.mapping_sel]
+ [skb_get_hash_raw(skb) % size];
}
static int xenvif_start_xmit(struct sk_buff *skb, struct net_device *dev)