diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-10-21 07:39:09 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-21 07:39:09 -0400 |
| commit | e83726b0460f4741c8f10e1488fbcc0a9e5f0b7e (patch) | |
| tree | 63708770aa5d02847ac89c4fd2cf21826a41ab36 | |
| parent | 612eef4f4714d5c0e7127b7b245dbfc444d14a4b (diff) | |
l2tp: small cleanup
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/l2tp/l2tp_ip.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c index 226a0ae3bcfd..1c770c0644d1 100644 --- a/net/l2tp/l2tp_ip.c +++ b/net/l2tp/l2tp_ip.c | |||
| @@ -65,9 +65,7 @@ static struct sock *__l2tp_ip_bind_lookup(struct net *net, __be32 laddr, int dif | |||
| 65 | continue; | 65 | continue; |
| 66 | 66 | ||
| 67 | if ((l2tp->conn_id == tunnel_id) && | 67 | if ((l2tp->conn_id == tunnel_id) && |
| 68 | #ifdef CONFIG_NET_NS | 68 | net_eq(sock_net(sk), net) && |
| 69 | (sk->sk_net == net) && | ||
| 70 | #endif | ||
| 71 | !(inet->inet_rcv_saddr && inet->inet_rcv_saddr != laddr) && | 69 | !(inet->inet_rcv_saddr && inet->inet_rcv_saddr != laddr) && |
| 72 | !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif)) | 70 | !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif)) |
| 73 | goto found; | 71 | goto found; |
