aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/dev.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2010-02-26 01:34:51 -0500
committerDavid S. Miller <davem@davemloft.net>2010-02-27 05:43:39 -0500
commita2835763e130c343ace5320c20d33c281e7097b7 (patch)
tree26077aa8aec7a61fd7e3de31c5eeec4960f78079 /net/core/dev.c
parent10de05afe01c12cedc42eb9ce05b111eed6c8210 (diff)
rtnetlink: handle rtnl_link netlink notifications manually
In order to support specifying device flags during device creation, we must be able to roll back device registration in case setting the flags fails without sending any notifications related to the device to userspace. This patch changes rollback_registered_many() and register_netdevice() to manually send netlink notifications for devices not handled by rtnl_link and allows to defer notifications for devices handled by rtnl_link until setup is complete. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index eb7f1a4fefc6..75332b089529 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4865,6 +4865,10 @@ static void rollback_registered_many(struct list_head *head)
4865 */ 4865 */
4866 call_netdevice_notifiers(NETDEV_UNREGISTER, dev); 4866 call_netdevice_notifiers(NETDEV_UNREGISTER, dev);
4867 4867
4868 if (!dev->rtnl_link_ops ||
4869 dev->rtnl_link_state == RTNL_LINK_INITIALIZED)
4870 rtmsg_ifinfo(RTM_DELLINK, dev, ~0U);
4871
4868 /* 4872 /*
4869 * Flush the unicast and multicast chains 4873 * Flush the unicast and multicast chains
4870 */ 4874 */
@@ -5091,7 +5095,9 @@ int register_netdevice(struct net_device *dev)
5091 * Prevent userspace races by waiting until the network 5095 * Prevent userspace races by waiting until the network
5092 * device is fully setup before sending notifications. 5096 * device is fully setup before sending notifications.
5093 */ 5097 */
5094 rtmsg_ifinfo(RTM_NEWLINK, dev, ~0U); 5098 if (!dev->rtnl_link_ops ||
5099 dev->rtnl_link_state == RTNL_LINK_INITIALIZED)
5100 rtmsg_ifinfo(RTM_NEWLINK, dev, ~0U);
5095 5101
5096out: 5102out:
5097 return ret; 5103 return ret;