aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netconsole.c
diff options
context:
space:
mode:
authorAmerigo Wang <amwang@redhat.com>2011-05-19 21:39:12 +0000
committerDavid S. Miller <davem@davemloft.net>2011-05-22 21:01:19 -0400
commitdaf9209bb2c8b07ca025eac82e3d175534086c77 (patch)
tree5101649f4edf2cf316e334c49380b6dd1ecebc77 /drivers/net/netconsole.c
parentbridge: call NETDEV_JOIN notifiers when add a slave (diff)
downloadlinux-dev-daf9209bb2c8b07ca025eac82e3d175534086c77.tar.xz
linux-dev-daf9209bb2c8b07ca025eac82e3d175534086c77.zip
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.c6
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,
bool stopped = false;
if (!(event == NETDEV_CHANGENAME || event == NETDEV_UNREGISTER ||
- event == NETDEV_BONDING_DESLAVE || event == NETDEV_JOIN))
+ event == NETDEV_RELEASE || event == NETDEV_JOIN))
goto done;
spin_lock_irqsave(&target_list_lock, flags);
@@ -632,7 +632,7 @@ static int netconsole_netdev_event(struct notifier_block *this,
case NETDEV_CHANGENAME:
strlcpy(nt->np.dev_name, dev->name, IFNAMSIZ);
break;
- case NETDEV_BONDING_DESLAVE:
+ case NETDEV_RELEASE:
case NETDEV_JOIN:
case NETDEV_UNREGISTER:
/*
@@ -664,7 +664,7 @@ static int netconsole_netdev_event(struct notifier_block *this,
case NETDEV_UNREGISTER:
printk(KERN_CONT "unregistered\n");
break;
- case NETDEV_BONDING_DESLAVE:
+ case NETDEV_RELEASE:
printk(KERN_CONT "released slaves\n");
break;
case NETDEV_JOIN: