diff --git a/[refs] b/[refs] index 1a9cca4d1d1f..0c81d6d82aeb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 839d1624b9dcf31fdc02e47359043bb7bd71d6ca +refs/heads/master: 993e6f2fd487e2acddd711f79cf48f3420731382 diff --git a/trunk/drivers/net/can/dev.c b/trunk/drivers/net/can/dev.c index 9e4283aff828..e1a4f8214239 100644 --- a/trunk/drivers/net/can/dev.c +++ b/trunk/drivers/net/can/dev.c @@ -611,11 +611,18 @@ static int can_fill_xstats(struct sk_buff *skb, const struct net_device *dev) return -EMSGSIZE; } +static int can_newlink(struct net_device *dev, + struct nlattr *tb[], struct nlattr *data[]) +{ + return -EOPNOTSUPP; +} + static struct rtnl_link_ops can_link_ops __read_mostly = { .kind = "can", .maxtype = IFLA_CAN_MAX, .policy = can_policy, .setup = can_setup, + .newlink = can_newlink, .changelink = can_changelink, .fill_info = can_fill_info, .fill_xstats = can_fill_xstats,