Commit bf9f0884 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

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

This reverts commit 6f8f768a which was
bce271f2 upstream.

It was applied incorrectly, and isn't needed for 3.14-stable.
Reported-by: default avatarWilly Tarreau <w@1wt.eu>
Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
parent a38ae26d
...@@ -665,9 +665,6 @@ static int can_changelink(struct net_device *dev, ...@@ -665,9 +665,6 @@ static int can_changelink(struct net_device *dev,
} }
} }
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