---

yaml --- r: 133875 b: refs/heads/master c: f5882c3 h: refs/heads/master i: 133873: 8628f26 133871: 14e1352 v: v3
git-mirror · Jan 21, 2009 · 8864728 · 8864728
1 parent 11f5007
commit 8864728
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 273ec51dd7ceaa76e038875d85061ec856d8905e
+refs/heads/master: f5882c30508c1e3c4fbbdaa9ca08d0922c5fb071
diff --git a/trunk/drivers/net/pppoe.c b/trunk/drivers/net/pppoe.c
@@ -695,7 +695,7 @@ static int pppoe_connect(struct socket *sock, struct sockaddr *uservaddr,
 		po->chan.private = sk;
 		po->chan.ops = &pppoe_chan_ops;
 
-		error = ppp_register_channel(&po->chan);
+		error = ppp_register_net_channel(dev_net(dev), &po->chan);
 		if (error)
 			goto err_put;
 

diff --git a/trunk/drivers/net/pppol2tp.c b/trunk/drivers/net/pppol2tp.c
@@ -1749,7 +1749,7 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,
 	po->chan.ops	 = &pppol2tp_chan_ops;
 	po->chan.mtu	 = session->mtu;
 
-	error = ppp_register_channel(&po->chan);
+	error = ppp_register_net_channel(sock_net(sk), &po->chan);
 	if (error)
 		goto end_put_tun;