diff options
author | Cyrill Gorcunov <gorcunov@gmail.com> | 2009-01-21 18:55:40 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-21 18:55:40 -0500 |
commit | f5882c30508c1e3c4fbbdaa9ca08d0922c5fb071 (patch) | |
tree | 54522f9e2fe8d88221364c8b3edaa7215c7d48ed | |
parent | 273ec51dd7ceaa76e038875d85061ec856d8905e (diff) |
net: pppoe,pppol2tp - register channels with explicit net
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>
-rw-r--r-- | drivers/net/pppoe.c | 2 | ||||
-rw-r--r-- | drivers/net/pppol2tp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index fb3056334aac..39f3e21647e7 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c | |||
@@ -695,7 +695,7 @@ static int pppoe_connect(struct socket *sock, struct sockaddr *uservaddr, | |||
695 | po->chan.private = sk; | 695 | po->chan.private = sk; |
696 | po->chan.ops = &pppoe_chan_ops; | 696 | po->chan.ops = &pppoe_chan_ops; |
697 | 697 | ||
698 | error = ppp_register_channel(&po->chan); | 698 | error = ppp_register_net_channel(dev_net(dev), &po->chan); |
699 | if (error) | 699 | if (error) |
700 | goto err_put; | 700 | goto err_put; |
701 | 701 | ||
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c index f3f9cb1f77c0..056e22a784b8 100644 --- a/drivers/net/pppol2tp.c +++ b/drivers/net/pppol2tp.c | |||
@@ -1749,7 +1749,7 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr, | |||
1749 | po->chan.ops = &pppol2tp_chan_ops; | 1749 | po->chan.ops = &pppol2tp_chan_ops; |
1750 | po->chan.mtu = session->mtu; | 1750 | po->chan.mtu = session->mtu; |
1751 | 1751 | ||
1752 | error = ppp_register_channel(&po->chan); | 1752 | error = ppp_register_net_channel(sock_net(sk), &po->chan); |
1753 | if (error) | 1753 | if (error) |
1754 | goto end_put_tun; | 1754 | goto end_put_tun; |
1755 | 1755 | ||