|
@@ -65,9 +65,7 @@ static struct sock *__l2tp_ip_bind_lookup(struct net *net, __be32 laddr, int dif
|
|
continue;
|
|
continue;
|
|
|
|
|
|
if ((l2tp->conn_id == tunnel_id) &&
|
|
if ((l2tp->conn_id == tunnel_id) &&
|
|
-#ifdef CONFIG_NET_NS
|
|
|
|
- (sk->sk_net == net) &&
|
|
|
|
-#endif
|
|
|
|
|
|
+ net_eq(sock_net(sk), net) &&
|
|
!(inet->inet_rcv_saddr && inet->inet_rcv_saddr != laddr) &&
|
|
!(inet->inet_rcv_saddr && inet->inet_rcv_saddr != laddr) &&
|
|
!(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
|
|
!(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
|
|
goto found;
|
|
goto found;
|