diff options
| author | David S. Miller <davem@davemloft.net> | 2018-05-12 02:53:22 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-12 02:53:22 +0200 |
| commit | b2d6cee117f708d493c020f9f355297321507be7 (patch) | |
| tree | 2c6975b47034de78fc899b4191260bb2704efc0f /net/ipv6/udp.c | |
| parent | net: phy: DP83TC811: Introduce support for the DP83TC811 phy (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-b2d6cee117f708d493c020f9f355297321507be7.tar.xz linux-b2d6cee117f708d493c020f9f355297321507be7.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The bpf syscall and selftests conflicts were trivial
overlapping changes.
The r8169 change involved moving the added mdelay from 'net' into a
different function.
A TLS close bug fix overlapped with the splitting of the TLS state
into separate TX and RX parts. I just expanded the tests in the bug
fix from "ctx->conf == X" into "ctx->tx_conf == X && ctx->rx_conf
== X".
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 0056ae766d93..2839c1bd1e58 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -148,9 +148,9 @@ static int compute_score(struct sock *sk, struct net *net, bool dev_match = (sk->sk_bound_dev_if == dif || sk->sk_bound_dev_if == sdif); - if (exact_dif && !dev_match) + if (!dev_match) return -1; - if (sk->sk_bound_dev_if && dev_match) + if (sk->sk_bound_dev_if) score++; } |