This is a note to let you know that I've just added the patch titled
l2tp: fix PPP pseudo-wire auto-loading
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
l2tp-fix-ppp-pseudo-wire-auto-loading.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Sun Apr 30 15:46:17 CEST 2017
From: Guillaume Nault <g.nault@xxxxxxxxxxxx>
Date: Mon, 3 Apr 2017 13:23:15 +0200
Subject: l2tp: fix PPP pseudo-wire auto-loading
From: Guillaume Nault <g.nault@xxxxxxxxxxxx>
[ 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@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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
@@ -1868,4 +1868,4 @@ MODULE_DESCRIPTION("PPP over L2TP over U
MODULE_LICENSE("GPL");
MODULE_VERSION(PPPOL2TP_DRV_VERSION);
MODULE_ALIAS("pppox-proto-" __stringify(PX_PROTO_OL2TP));
-MODULE_ALIAS_L2TP_PWTYPE(11);
+MODULE_ALIAS_L2TP_PWTYPE(7);
Patches currently in stable-queue which might be from g.nault@xxxxxxxxxxxx are
queue-4.4/l2tp-purge-socket-queues-in-the-.destruct-callback.patch
queue-4.4/l2tp-take-reference-on-sessions-being-dumped.patch
queue-4.4/l2tp-fix-ppp-pseudo-wire-auto-loading.patch