diff options
author | Amerigo Wang <amwang@redhat.com> | 2011-05-19 17:39:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-05-22 21:01:19 -0400 |
commit | daf9209bb2c8b07ca025eac82e3d175534086c77 (patch) | |
tree | 5101649f4edf2cf316e334c49380b6dd1ecebc77 /drivers/net/netconsole.c | |
parent | bb8ed6302b0613339c1a5f0a2cb0b3807c0af611 (diff) |
net: rename NETDEV_BONDING_DESLAVE to NETDEV_RELEASE
s/NETDEV_BONDING_DESLAVE/NETDEV_RELEASE/ as Andy suggested.
Signed-off-by: WANG Cong <amwang@redhat.com>
Cc: Andy Gospodarek <andy@greyhouse.net>
Cc: Neil Horman <nhorman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netconsole.c')
-rw-r--r-- | drivers/net/netconsole.c | 6 |
1 files changed, 3 insertions, 3 deletions
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: |