Revert "can: fix handling of unmodifiable configuration options fix"

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

diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index fa78e45a2beeb424a6efeb305e6d3db61b3165b7..de333c740203ddd68a1449b12a6a2d4b0b518f54 100644 (file)
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -665,9 +665,6 @@ static int can_changelink(struct net_device *dev,
                }
        }
 
-       if (!data)
-               return 0;
-
        if (data[IFLA_CAN_CTRLMODE]) {
                struct can_ctrlmode *cm;