diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/bonding/bond_main.c | 2 | ||||
-rw-r--r-- | drivers/net/netconsole.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index f4960f516c39..6dc428461541 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -1974,7 +1974,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev) | |||
1974 | } | 1974 | } |
1975 | 1975 | ||
1976 | block_netpoll_tx(); | 1976 | block_netpoll_tx(); |
1977 | netdev_bonding_change(bond_dev, NETDEV_BONDING_DESLAVE); | 1977 | netdev_bonding_change(bond_dev, NETDEV_RELEASE); |
1978 | write_lock_bh(&bond->lock); | 1978 | write_lock_bh(&bond->lock); |
1979 | 1979 | ||
1980 | slave = bond_get_slave_by_dev(bond, slave_dev); | 1980 | slave = bond_get_slave_by_dev(bond, slave_dev); |
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 4190786de403..dfc82720065a 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c | |||
@@ -621,7 +621,7 @@ static int netconsole_netdev_event(struct notifier_block *this, | |||
621 | bool stopped = false; | 621 | bool stopped = false; |
622 | 622 | ||
623 | if (!(event == NETDEV_CHANGENAME || event == NETDEV_UNREGISTER || | 623 | if (!(event == NETDEV_CHANGENAME || event == NETDEV_UNREGISTER || |
624 | event == NETDEV_BONDING_DESLAVE || event == NETDEV_JOIN)) | 624 | event == NETDEV_RELEASE || event == NETDEV_JOIN)) |
625 | goto done; | 625 | goto done; |
626 | 626 | ||
627 | spin_lock_irqsave(&target_list_lock, flags); | 627 | spin_lock_irqsave(&target_list_lock, flags); |
@@ -632,7 +632,7 @@ static int netconsole_netdev_event(struct notifier_block *this, | |||
632 | case NETDEV_CHANGENAME: | 632 | case NETDEV_CHANGENAME: |
633 | strlcpy(nt->np.dev_name, dev->name, IFNAMSIZ); | 633 | strlcpy(nt->np.dev_name, dev->name, IFNAMSIZ); |
634 | break; | 634 | break; |
635 | case NETDEV_BONDING_DESLAVE: | 635 | case NETDEV_RELEASE: |
636 | case NETDEV_JOIN: | 636 | case NETDEV_JOIN: |
637 | case NETDEV_UNREGISTER: | 637 | case NETDEV_UNREGISTER: |
638 | /* | 638 | /* |
@@ -664,7 +664,7 @@ static int netconsole_netdev_event(struct notifier_block *this, | |||
664 | case NETDEV_UNREGISTER: | 664 | case NETDEV_UNREGISTER: |
665 | printk(KERN_CONT "unregistered\n"); | 665 | printk(KERN_CONT "unregistered\n"); |
666 | break; | 666 | break; |
667 | case NETDEV_BONDING_DESLAVE: | 667 | case NETDEV_RELEASE: |
668 | printk(KERN_CONT "released slaves\n"); | 668 | printk(KERN_CONT "released slaves\n"); |
669 | break; | 669 | break; |
670 | case NETDEV_JOIN: | 670 | case NETDEV_JOIN: |