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

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

[gregkh]

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.10-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.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From foo@baz Sat Apr 29 08:22:40 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);


Patches currently in stable-queue which might be from g.nault@alphalink.fr are

queue-4.10/l2tp-purge-socket-queues-in-the-.destruct-callback.patch
queue-4.10/l2tp-hold-tunnel-socket-when-handling-control-frames-in-l2tp_ip-and-l2tp_ip6.patch
queue-4.10/l2tp-take-reference-on-sessions-being-dumped.patch
queue-4.10/l2tp-fix-ppp-pseudo-wire-auto-loading.patch