diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-09 13:32:42 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-11 09:59:58 +0200 |
| commit | bf9f0884fe92f1ed70575ab71d1c4113728a12b4 (patch) | |
| tree | 11d733820171fc4865bc83a9a875fd54e2984f6d | |
| parent | a38ae26d5b7a39deb83b53e7940acc217428622d (diff) | |
| download | lwn-bf9f0884fe92f1ed70575ab71d1c4113728a12b4.tar.gz lwn-bf9f0884fe92f1ed70575ab71d1c4113728a12b4.zip | |
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
| -rw-r--r-- | drivers/net/can/dev.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index fa78e45a2bee..de333c740203 100644 --- 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; |