From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 9 Sep 2016 11:34:10 +0000 (+0200)
Subject: 3.14-stable patches
X-Git-Tag: v3.14.79~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0281522f52261ffb3be508e825bda343730703c4;p=thirdparty%2Fkernel%2Fstable-queue.git

3.14-stable patches

added patches:
	revert-can-fix-handling-of-unmodifiable-configuration-options-fix.patch
---

diff --git a/queue-3.14/revert-can-fix-handling-of-unmodifiable-configuration-options-fix.patch b/queue-3.14/revert-can-fix-handling-of-unmodifiable-configuration-options-fix.patch
new file mode 100644
index 00000000000..60405a32f53
--- /dev/null
+++ b/queue-3.14/revert-can-fix-handling-of-unmodifiable-configuration-options-fix.patch
@@ -0,0 +1,31 @@
+From cbc6cd716c206318ee61e2432e6430388505db07 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Fri, 9 Sep 2016 13:32:42 +0200
+Subject: Revert "can: fix handling of unmodifiable configuration options fix"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 6f8f768a3586b6fbd50e249e7fe4f964a6994685 which was
+bce271f255dae8335dc4d2ee2c4531e09cc67f5a upstream.
+
+It was applied incorrectly, and isn't needed for 3.14-stable.
+
+Reported-by: Willy Tarreau <w@1wt.eu>
+Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
+
+---
+ drivers/net/can/dev.c |    3 ---
+ 1 file changed, 3 deletions(-)
+
+--- a/drivers/net/can/dev.c
++++ b/drivers/net/can/dev.c
+@@ -665,9 +665,6 @@ static int can_changelink(struct net_dev
+ 		}
+ 	}
+ 
+-	if (!data)
+-		return 0;
+-
+ 	if (data[IFLA_CAN_CTRLMODE]) {
+ 		struct can_ctrlmode *cm;
+ 
diff --git a/queue-3.14/series b/queue-3.14/series
new file mode 100644
index 00000000000..86ce4dd650e
--- /dev/null
+++ b/queue-3.14/series
@@ -0,0 +1 @@
+revert-can-fix-handling-of-unmodifiable-configuration-options-fix.patch