|
@@ -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);
|
|
@@ -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);
|
|
@@ -2038,6 +2043,9 @@ replay:
|
|
|
return -EOPNOTSUPP;
|
|
|
}
|
|
|
|
|
|
+ if (!ops->setup)
|
|
|
+ return -EOPNOTSUPP;
|
|
|
+
|
|
|
if (!ifname[0])
|
|
|
snprintf(ifname, IFNAMSIZ, "%s%%d", ops->kind);
|
|
|
|