diff options
| author |   Guillaume Nault <g.nault@alphalink.fr> | 2015-12-02 16:27:39 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-12-03 15:12:54 -0500 |
| commit | 681b4d88ad8e5b67c34f4d0a40448efb94e2b227 (patch) | |
| tree | 2cc08a0d7bccfc1d22ddd1f947a6147581db6612 /drivers/net/ppp/pppoe.c | |
| parent | Merge branch 'vsock-virtio' (diff) | |
| download | linux-dev-681b4d88ad8e5b67c34f4d0a40448efb94e2b227.tar.xz linux-dev-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 'drivers/net/ppp/pppoe.c')
| -rw-r--r-- | drivers/net/ppp/pppoe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c index 277e6827d7cd..b8da2eabac3e 100644 --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c @@ -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); |