[PATCH 5/5] net: pppoe,pppol2tp - register channels with explicit net
From: Cyrill Gorcunov <hidden>
Date: 2009-01-20 14:13:43
In PPPo[E|L2TP] we could explicitly point which net namespace we're going to use for channels - make it so. CC: James Chapman <jchapman@katalix.com> CC: Michal Ostrowski <redacted> Signed-off-by: Cyrill Gorcunov <redacted> --- drivers/net/pppoe.c | 2 +- drivers/net/pppol2tp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6.git/drivers/net/pppoe.c ===================================================================
--- linux-2.6.git.orig/drivers/net/pppoe.c
+++ linux-2.6.git/drivers/net/pppoe.c@@ -695,7 +695,7 @@ static int pppoe_connect(struct socket * 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;
Index: linux-2.6.git/drivers/net/pppol2tp.c ===================================================================
--- linux-2.6.git.orig/drivers/net/pppol2tp.c
+++ linux-2.6.git/drivers/net/pppol2tp.c@@ -1749,7 +1749,7 @@ static int pppol2tp_connect(struct socke 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;
--