From eb8c1f476b808ee07667f96f3a5de1b6e5465dd1 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 21 Oct 2010 04:39:09 -0700
Subject: [PATCH] --- yaml --- r: 215441 b: refs/heads/master c:
 e83726b0460f4741c8f10e1488fbcc0a9e5f0b7e h: refs/heads/master i:   215439:
 22efd73598d118e75df07125c81e399580db75d3 v: v3

---
 [refs]                   | 2 +-
 trunk/net/l2tp/l2tp_ip.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 79167c6ee2ac..8872bebb11fb 100644
--- 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
index 226a0ae3bcfd..1c770c0644d1 100644
--- 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;