From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 17 May 2018 19:14:45 +0000 (+0200)
Subject: 4.9-stable patches
X-Git-Tag: v4.16.10~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b2ac76efca03d25dc52abadcbe49a3531cdae5bc;p=thirdparty%2Fkernel%2Fstable-queue.git

4.9-stable patches

added patches:
	l2tp-revert-l2tp-fix-missing-print-session-offset-info.patch
---

diff --git a/queue-4.9/l2tp-revert-l2tp-fix-missing-print-session-offset-info.patch b/queue-4.9/l2tp-revert-l2tp-fix-missing-print-session-offset-info.patch
new file mode 100644
index 00000000000..38ab94132ec
--- /dev/null
+++ b/queue-4.9/l2tp-revert-l2tp-fix-missing-print-session-offset-info.patch
@@ -0,0 +1,32 @@
+From de3b58bc359a861d5132300f53f95e83f71954b3 Mon Sep 17 00:00:00 2001
+From: James Chapman <jchapman@katalix.com>
+Date: Wed, 3 Jan 2018 22:48:05 +0000
+Subject: l2tp: revert "l2tp: fix missing print session offset info"
+
+From: James Chapman <jchapman@katalix.com>
+
+commit de3b58bc359a861d5132300f53f95e83f71954b3 upstream.
+
+Revert commit 820da5357572 ("l2tp: fix missing print session offset
+info").  The peer_offset parameter is removed.
+
+Signed-off-by: James Chapman <jchapman@katalix.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Cc: Guillaume Nault <g.nault@alphalink.fr>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/l2tp/l2tp_netlink.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/net/l2tp/l2tp_netlink.c
++++ b/net/l2tp/l2tp_netlink.c
+@@ -750,8 +750,6 @@ static int l2tp_nl_session_send(struct s
+ 
+ 	if ((session->ifname[0] &&
+ 	     nla_put_string(skb, L2TP_ATTR_IFNAME, session->ifname)) ||
+-	    (session->offset &&
+-	     nla_put_u16(skb, L2TP_ATTR_OFFSET, session->offset)) ||
+ 	    (session->cookie_len &&
+ 	     nla_put(skb, L2TP_ATTR_COOKIE, session->cookie_len,
+ 		     &session->cookie[0])) ||
diff --git a/queue-4.9/series b/queue-4.9/series
index 916c40f71ce..6c08fb43431 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -28,3 +28,4 @@ futex-remove-duplicated-code-and-fix-undefined-behaviour.patch
 xfrm-fix-xfrm_do_migrate-with-aead-e.g-aes-gcm.patch
 lockd-lost-rollback-of-set_grace_period-in-lockd_down_net.patch
 revert-arm-dts-imx6qdl-wandboard-fix-audio-channel-swap.patch
+l2tp-revert-l2tp-fix-missing-print-session-offset-info.patch