Skip to content

Commit

Permalink
rtnetlink: allow to register ops without ops->setup set
Browse files Browse the repository at this point in the history
So far, it is assumed that ops->setup is filled up. But there might be
case that ops might make sense even without ->setup. In that case,
forbid to newlink and dellink.

This allows to register simple rtnl link ops containing only ->kind.
That allows consistent way of passing device kind (either device-kind or
slave-kind) to userspace.

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jiri Pirko authored and David S. Miller committed Jul 1, 2014
1 parent 9bf2b8c commit b0ab2fa
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion net/core/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -7091,7 +7091,7 @@ static void __net_exit default_device_exit_batch(struct list_head *net_list)
rtnl_lock_unregistering(net_list);
list_for_each_entry(net, net_list, exit_list) {
for_each_netdev_reverse(net, dev) {
if (dev->rtnl_link_ops)
if (dev->rtnl_link_ops && dev->rtnl_link_ops->dellink)
dev->rtnl_link_ops->dellink(dev, &dev_kill_list);
else
unregister_netdevice_queue(dev, &dev_kill_list);
Expand Down
12 changes: 10 additions & 2 deletions net/core/rtnetlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,12 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
if (rtnl_link_ops_get(ops->kind))
return -EEXIST;

if (!ops->dellink)
/* The check for setup is here because if ops
* does not have that filled up, it is not possible
* to use the ops for creating device. So do not
* fill up dellink as well. That disables rtnl_dellink.
*/
if (ops->setup && !ops->dellink)
ops->dellink = unregister_netdevice_queue;

list_add_tail(&ops->list, &link_ops);
Expand Down Expand Up @@ -1777,7 +1782,7 @@ static int rtnl_dellink(struct sk_buff *skb, struct nlmsghdr *nlh)
return -ENODEV;

ops = dev->rtnl_link_ops;
if (!ops)
if (!ops || !ops->dellink)
return -EOPNOTSUPP;

ops->dellink(dev, &list_kill);
Expand Down Expand Up @@ -2038,6 +2043,9 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh)
return -EOPNOTSUPP;
}

if (!ops->setup)
return -EOPNOTSUPP;

if (!ifname[0])
snprintf(ifname, IFNAMSIZ, "%s%%d", ops->kind);

Expand Down

0 comments on commit b0ab2fa

Please sign in to comment.