Commit 02910968 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Jiri Slaby

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

This reverts commit ded1c127 which was
bce271f2 upstream.

It was applied incorrectly, and isn't needed for 3.12-stable.
Reported-by: default avatarWilly Tarreau <w@1wt.eu>
Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
parent dc7d223a
...@@ -644,9 +644,6 @@ static int can_changelink(struct net_device *dev, ...@@ -644,9 +644,6 @@ static int can_changelink(struct net_device *dev,
/* We need synchronization with dev->stop() */ /* We need synchronization with dev->stop() */
ASSERT_RTNL(); ASSERT_RTNL();
if (!data)
return 0;
if (data[IFLA_CAN_CTRLMODE]) { if (data[IFLA_CAN_CTRLMODE]) {
struct can_ctrlmode *cm; struct can_ctrlmode *cm;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment