4.14-stable patches

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

diff --git a/queue-4.14/l2tp-revert-l2tp-fix-missing-print-session-offset-info.patch b/queue-4.14/l2tp-revert-l2tp-fix-missing-print-session-offset-info.patch
new file mode 100644 (file)
index 0000000..84c0ea3
--- /dev/null
+++ b/queue-4.14/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
+@@ -765,8 +765,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.14/series b/queue-4.14/series
index be4905605376a76f7119a7748ee468c668e1fce0..68e379ba96cd4f53a63a727ee9b1b266f7f04dfd 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -41,3 +41,4 @@ scsi-aacraid-correct-hba_send-to-include-iu_type.patch
 xfrm-use-__skb_queue_tail-in-xfrm_trans_queue.patch
 btrfs-take-trans-lock-before-access-running-trans-in-check_delayed_ref.patch
 xfrm-fix-xfrm_do_migrate-with-aead-e.g-aes-gcm.patch
+l2tp-revert-l2tp-fix-missing-print-session-offset-info.patch