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

Commit 681b4d88 authored by Guillaume Nault's avatar Guillaume Nault Committed by David S. Miller
Browse files

pppox: use standard module auto-loading feature 



* Register PF_PPPOX with pppox module rather than with pppoe,
    so that pppoe doesn't get loaded for any PF_PPPOX socket.

  * Register PX_PROTO_* with standard MODULE_ALIAS_NET_PF_PROTO()
    instead of using pppox's own naming scheme.

  * While there, add auto-loading feature for pptp.

Signed-off-by: default avatarGuillaume Nault <g.nault@alphalink.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c402293b

drivers/net/ppp/pppoe.c

+1 −1
Original line number Diff line number Diff line
@@ -1202,4 +1202,4 @@ module_exit(pppoe_exit); 
MODULE_AUTHOR("Michal Ostrowski <mostrows@speakeasy.net>");

MODULE_DESCRIPTION("PPP over Ethernet driver");

MODULE_LICENSE("GPL");

MODULE_ALIAS_NETPROTO(PF_PPPOX);
 
MODULE_ALIAS_NET_PF_PROTO(PF_PPPOX, PX_PROTO_OE);

drivers/net/ppp/pppox.c

+2 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static int pppox_create(struct net *net, struct socket *sock, int protocol, 


	rc = -EPROTONOSUPPORT;

	if (!pppox_protos[protocol])

		request_module("pppox-proto-%d", protocol);

		request_module("net-pf-%d-proto-%d", PF_PPPOX, protocol);

	if (!pppox_protos[protocol] ||

	    !try_module_get(pppox_protos[protocol]->owner))

		goto out;
@@ -147,3 +147,4 @@ module_exit(pppox_exit); 
MODULE_AUTHOR("Michal Ostrowski <mostrows@speakeasy.net>");

MODULE_DESCRIPTION("PPP over Ethernet driver (generic socket layer)");

MODULE_LICENSE("GPL");

MODULE_ALIAS_NETPROTO(PF_PPPOX);

drivers/net/ppp/pptp.c

+1 −0
Original line number Diff line number Diff line
@@ -718,3 +718,4 @@ module_exit(pptp_exit_module); 
MODULE_DESCRIPTION("Point-to-Point Tunneling Protocol");

MODULE_AUTHOR("D. Kozlov (xeb@mail.ru)");

MODULE_LICENSE("GPL");

MODULE_ALIAS_NET_PF_PROTO(PF_PPPOX, PX_PROTO_PPTP);

net/l2tp/l2tp_ppp.c

+1 −1
Original line number Diff line number Diff line
@@ -1862,5 +1862,5 @@ MODULE_AUTHOR("James Chapman <jchapman@katalix.com>"); 
MODULE_DESCRIPTION("PPP over L2TP over UDP");

MODULE_LICENSE("GPL");

MODULE_VERSION(PPPOL2TP_DRV_VERSION);

MODULE_ALIAS("pppox-proto-" __stringify(PX_PROTO_OL2TP));

MODULE_ALIAS_NET_PF_PROTO(PF_PPPOX, PX_PROTO_OL2TP);

MODULE_ALIAS_L2TP_PWTYPE(11);