summaryrefslogtreecommitdiffstats
path: root/net/l2tp
diff options
context:
space:
mode:
authorGuillaume Nault <g.nault@alphalink.fr>2015-12-02 16:27:39 +0100
committerDavid S. Miller <davem@davemloft.net>2015-12-03 15:12:54 -0500
commit681b4d88ad8e5b67c34f4d0a40448efb94e2b227 (patch)
tree2cc08a0d7bccfc1d22ddd1f947a6147581db6612 /net/l2tp
parentc402293bd76fbc93e52ef8c0947ab81eea3ae019 (diff)
downloadlinux-681b4d88ad8e5b67c34f4d0a40448efb94e2b227.tar.gz
linux-681b4d88ad8e5b67c34f4d0a40448efb94e2b227.tar.bz2
linux-681b4d88ad8e5b67c34f4d0a40448efb94e2b227.zip
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: Guillaume Nault <g.nault@alphalink.fr> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp')
-rw-r--r--net/l2tp/l2tp_ppp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index 1ad18c55064c..d93f113cb522 100644
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -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);