From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
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@xxxxxx>
Signed-off-by: Greg Kroah-Hartman gregkh@xxxxxxxxxxxxxxxxxxx
---
drivers/net/can/dev.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index 561bed7eb6a5..464e5f66b66d 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -644,9 +644,6 @@ static int can_changelink(struct net_device *dev,
/* We need synchronization with dev->stop() */
ASSERT_RTNL();
- if (!data)
- return 0;
-
if (data[IFLA_CAN_CTRLMODE]) {
struct can_ctrlmode *cm;
--
2.10.0
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html