Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net

Pull in bug fixes from 'net' tree for the merge window.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 2 deletions

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 2c8beb3896d1..aae4938f3dea 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -158,13 +158,14 @@ static struct sock *udp6_lib_lookup2(struct net *net,
                 score = compute_score(sk, net, saddr, sport,
                                       daddr, hnum, dif, sdif);
                 if (score > badness) {
-                        if (sk->sk_reuseport) {
+                        if (sk->sk_reuseport &&
+                            sk->sk_state != TCP_ESTABLISHED) {
                                 hash = udp6_ehashfn(net, daddr, hnum,
                                                     saddr, sport);
 
                                 result = reuseport_select_sock(sk, hash, skb,
                                                         sizeof(struct udphdr));
-                                if (result)
+                                if (result && !reuseport_has_conns(sk, false))
                                         return result;
                         }
                         result = sk;