diff options
author | David S. Miller <davem@davemloft.net> | 2020-02-27 18:31:39 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-02-27 18:31:39 -0800 |
commit | 9f6e055907362f6692185c1c9658295d24095c74 (patch) | |
tree | a7dc22fa7481300c92c0a33b54a32cb9ee551b5f /net/core/dev.c | |
parent | ec4a514a6870ee3a83fb8788635cf871ee32e665 (diff) | |
parent | 7058b837899fc978c9f8a033fa29ab07360a85c8 (diff) | |
download | linux-9f6e055907362f6692185c1c9658295d24095c74.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The mptcp conflict was overlapping additions.
The SMC conflict was an additional and removal happening at the same
time.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index dbbfff123196..25dab1598803 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3076,6 +3076,8 @@ static u16 skb_tx_hash(const struct net_device *dev, if (skb_rx_queue_recorded(skb)) { hash = skb_get_rx_queue(skb); + if (hash >= qoffset) + hash -= qoffset; while (unlikely(hash >= qcount)) hash -= qcount; return hash + qoffset; |