aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/rtnetlink.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/rtnetlink.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/rtnetlink.c')
-rw-r--r--net/core/rtnetlink.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index b7c7dfd86507..020e43bfef5f 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1425,9 +1425,6 @@ static int rtnetlink_event(struct notifier_block *this, unsigned long event, voi
1425 struct net_device *dev = ptr; 1425 struct net_device *dev = ptr;
1426 1426
1427 switch (event) { 1427 switch (event) {
1428 case NETDEV_UNREGISTER:
1429 rtmsg_ifinfo(RTM_DELLINK, dev, ~0U);
1430 break;
1431 case NETDEV_UP: 1428 case NETDEV_UP:
1432 case NETDEV_DOWN: 1429 case NETDEV_DOWN:
1433 rtmsg_ifinfo(RTM_NEWLINK, dev, IFF_UP|IFF_RUNNING); 1430 rtmsg_ifinfo(RTM_NEWLINK, dev, IFF_UP|IFF_RUNNING);
@@ -1437,6 +1434,7 @@ static int rtnetlink_event(struct notifier_block *this, unsigned long event, voi
1437 case NETDEV_REGISTER: 1434 case NETDEV_REGISTER:
1438 case NETDEV_CHANGE: 1435 case NETDEV_CHANGE:
1439 case NETDEV_GOING_DOWN: 1436 case NETDEV_GOING_DOWN:
1437 case NETDEV_UNREGISTER:
1440 case NETDEV_UNREGISTER_BATCH: 1438 case NETDEV_UNREGISTER_BATCH:
1441 break; 1439 break;
1442 default: 1440 default: