diff options
author | 2009-08-18 23:37:37 +0200 | |
---|---|---|
committer | 2009-08-18 23:37:37 +0200 | |
commit | af15c1addf920d830b030e3489a482456904ca8c (patch) | |
tree | dc4adab63d19507f7ac44855ad9920f8fd2dd2f0 /drivers/net/can/dev.c | |
parent | Merge branch 'master' into for-linus (diff) | |
parent | Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
download | linux-dev-af15c1addf920d830b030e3489a482456904ca8c.tar.xz linux-dev-af15c1addf920d830b030e3489a482456904ca8c.zip |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/net/can/dev.c')
-rw-r--r-- | drivers/net/can/dev.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index 9e4283aff828..e1a4f8214239 100644 --- a/drivers/net/can/dev.c +++ b/drivers/net/can/dev.c @@ -611,11 +611,18 @@ nla_put_failure: 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, |