diff options
| author | Guillaume Nault <g.nault@alphalink.fr> | 2017-04-03 07:23:15 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-03 11:36:35 -0400 |
| commit | 425cc775d18aa176bdbd2600c4509be14f5c938d (patch) | |
| tree | 0b538bc809b21a4265de340d83fe16cda796a410 | |
| parent | b7902607693fb63b3c31af97e93465128e635269 (diff) | |
l2tp: fix PPP pseudo-wire auto-loading
[ Upstream commit 249ee819e24c180909f43c1173c8ef6724d21faf ]
PPP pseudo-wire type is 7 (11 is L2TP_PWTYPE_IP).
Fixes: f1f39f911027 ("l2tp: auto load type modules")
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/l2tp/l2tp_ppp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index 4db33174fe89..1387f547a09e 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c | |||
| @@ -1848,4 +1848,4 @@ MODULE_DESCRIPTION("PPP over L2TP over UDP"); | |||
| 1848 | MODULE_LICENSE("GPL"); | 1848 | MODULE_LICENSE("GPL"); |
| 1849 | MODULE_VERSION(PPPOL2TP_DRV_VERSION); | 1849 | MODULE_VERSION(PPPOL2TP_DRV_VERSION); |
| 1850 | MODULE_ALIAS_NET_PF_PROTO(PF_PPPOX, PX_PROTO_OL2TP); | 1850 | MODULE_ALIAS_NET_PF_PROTO(PF_PPPOX, PX_PROTO_OL2TP); |
| 1851 | MODULE_ALIAS_L2TP_PWTYPE(11); | 1851 | MODULE_ALIAS_L2TP_PWTYPE(7); |