lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: pppoe,pppol2tp - register channels with explicit net

Browse Source 
In PPPo[E|L2TP] we could explicitly point which net namespace
we're going to use for channels - make it so.

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: James Chapman <jchapman@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Cyrill Gorcunov
2009-01-21 15:55:40 -08:00
committed by David S. Miller
parent 273ec51dd7
commit f5882c3050
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/pppoe.c
View File

@@ -695,7 +695,7 @@ static int pppoe_connect(struct socket *sock, struct sockaddr *uservaddr,
po->chan.private = sk; po->chan.private = sk;
po->chan.ops = &pppoe_chan_ops; po->chan.ops = &pppoe_chan_ops;
error = ppp_register_channel(&po->chan); error = ppp_register_net_channel(dev_net(dev), &po->chan);
if (error) if (error)
goto err_put; goto err_put;

2
drivers/net/pppol2tp.c
View File

@@ -1749,7 +1749,7 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,
po->chan.ops = &pppol2tp_chan_ops; po->chan.ops = &pppol2tp_chan_ops;
po->chan.mtu = session->mtu; po->chan.mtu = session->mtu;
error = ppp_register_channel(&po->chan); error = ppp_register_net_channel(sock_net(sk), &po->chan);
if (error) if (error)
goto end_put_tun; goto end_put_tun;