From patchwork Thu Jan 1 00:00:05 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [5/5] net: pppoe,pppol2tp - register channels with explicit net Date: Wed, 31 Dec 1969 14:00:05 -0000 From: Cyrill Gorcunov X-Patchwork-Id: 19495 Message-Id: <4975dc14.0637560a.7f8e.729c@mx.google.com> To: davem@davemloft.net, jchapman@katalix.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, devel@openvz.org, xemul@openvz.org Cc: Michal Ostrowski , Cyrill Gorcunov In PPPo[E|L2TP] we could explicitly point which net namespace we're going to use for channels - make it so. CC: James Chapman CC: Michal Ostrowski Signed-off-by: Cyrill Gorcunov Signed-off-by: James Chapman --- 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;