| From foo@baz Sat Apr 29 08:22:13 CEST 2017 |
| From: Guillaume Nault <g.nault@alphalink.fr> |
| Date: Mon, 3 Apr 2017 13:23:15 +0200 |
| Subject: l2tp: fix PPP pseudo-wire auto-loading |
| |
| From: Guillaume Nault <g.nault@alphalink.fr> |
| |
| |
| [ 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> |
| --- |
| net/l2tp/l2tp_ppp.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/l2tp/l2tp_ppp.c |
| +++ b/net/l2tp/l2tp_ppp.c |
| @@ -1848,4 +1848,4 @@ MODULE_DESCRIPTION("PPP over L2TP over U |
| 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); |
