From: Greg Kroah-Hartman <[email protected]>

3.12-stable review patch.  If anyone has any objections, please let me know.

===============

This reverts commit ded1c127d6dc1a1827f3ff657a4cb7edd646092e which was
bce271f255dae8335dc4d2ee2c4531e09cc67f5a upstream.

It was applied incorrectly, and isn't needed for 3.12-stable.

Reported-by: Willy Tarreau <[email protected]>
Signed-off-by: Greg Kroah-Hartman [email protected]
---
 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

Reply via email to