| From 2b4119e742d3b11249542038806057b2e61e435f Mon Sep 17 00:00:00 2001 |
| From: Guillaume Nault <g.nault@alphalink.fr> |
| Date: Mon, 3 Apr 2017 13:23:15 +0200 |
| Subject: [PATCH] l2tp: fix PPP pseudo-wire auto-loading |
| |
| commit 249ee819e24c180909f43c1173c8ef6724d21faf upstream. |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c |
| index b98191045df6..43aea42d342d 100644 |
| --- a/net/l2tp/l2tp_ppp.c |
| +++ b/net/l2tp/l2tp_ppp.c |
| @@ -1850,4 +1850,4 @@ MODULE_DESCRIPTION("PPP over L2TP over UDP"); |
| MODULE_LICENSE("GPL"); |
| MODULE_VERSION(PPPOL2TP_DRV_VERSION); |
| MODULE_ALIAS_NET_PF_PROTO(PF_PPPOX, PX_PROTO_OL2TP); |
| -MODULE_ALIAS_L2TP_PWTYPE(11); |
| +MODULE_ALIAS_L2TP_PWTYPE(7); |
| -- |
| 2.12.0 |
| |
