Skip to contentSkip to conversation

Patch "l2tp: fix PPP pseudo-wire auto-loading" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Apr 30, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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 <[email protected]> know about it.

Quoted 1 line

From foo@baz Sun Apr 30 15:46:17 CEST 2017

From: Guillaume Nault <[email protected]>
Date: Mon, 3 Apr 2017 13:23:15 +0200
Subject: l2tp: fix PPP pseudo-wire auto-loading

From: Guillaume Nault <[email protected]>

[ Upstream commit 249ee819e24c180909f43c1173c8ef6724d21faf ]

PPP pseudo-wire type is 7 (11 is L2TP_PWTYPE_IP).

Fixes f1f39f911027 ("l2tp: auto load type modules")
---
 net/l2tp/l2tp_ppp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/l2tp/l2tp_ppp.c +1 -1
@@ -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 [email protected] 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