---

yaml --- r: 215441 b: refs/heads/master c: e83726b h: refs/heads/master i: 215439: 22efd73 v: v3
git-mirror · Oct 21, 2010 · eb8c1f4 · eb8c1f4
1 parent c43b8ca
commit eb8c1f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 612eef4f4714d5c0e7127b7b245dbfc444d14a4b
+refs/heads/master: e83726b0460f4741c8f10e1488fbcc0a9e5f0b7e
diff --git a/trunk/net/l2tp/l2tp_ip.c b/trunk/net/l2tp/l2tp_ip.c
@@ -65,9 +65,7 @@ static struct sock *__l2tp_ip_bind_lookup(struct net *net, __be32 laddr, int dif
 			continue;
 
 		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) &&
 		    !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
 			goto found;