Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5882c30 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by David S. Miller
Browse files

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: default avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: default avatarJames Chapman <jchapman@katalix.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 273ec51d

drivers/net/pppoe.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/pppol2tp.c

+1 −1
Original line number Diff line number Diff line
@@ -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;