Skip to content

Commit

Permalink
Revert "can: fix handling of unmodifiable configuration options fix"
Browse files Browse the repository at this point in the history
This reverts commit 6f8f768 which was
bce271f 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
  • Loading branch information
Greg Kroah-Hartman committed Sep 11, 2016
1 parent a38ae26 commit bf9f088
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions drivers/net/can/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit bf9f088

Please sign in to comment.