lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: rename NETDEV_BONDING_DESLAVE to NETDEV_RELEASE

Browse Source 
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>
This commit is contained in:
Amerigo Wang
2011-05-19 21:39:12 +00:00
committed by David S. Miller
parent bb8ed6302b
commit daf9209bb2
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/bonding/bond_main.c
View File

@@ -1974,7 +1974,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
} }
block_netpoll_tx(); block_netpoll_tx();
netdev_bonding_change(bond_dev, NETDEV_BONDING_DESLAVE); netdev_bonding_change(bond_dev, NETDEV_RELEASE);
write_lock_bh(&bond->lock); write_lock_bh(&bond->lock);
slave = bond_get_slave_by_dev(bond, slave_dev); slave = bond_get_slave_by_dev(bond, slave_dev);

6
drivers/net/netconsole.c
View File

@@ -621,7 +621,7 @@ static int netconsole_netdev_event(struct notifier_block *this,
bool stopped = false; bool stopped = false;
if (!(event == NETDEV_CHANGENAME || event == NETDEV_UNREGISTER || if (!(event == NETDEV_CHANGENAME || event == NETDEV_UNREGISTER ||
event == NETDEV_BONDING_DESLAVE || event == NETDEV_JOIN)) event == NETDEV_RELEASE || event == NETDEV_JOIN))
goto done; goto done;
spin_lock_irqsave(&target_list_lock, flags); spin_lock_irqsave(&target_list_lock, flags);
@@ -632,7 +632,7 @@ static int netconsole_netdev_event(struct notifier_block *this,
case NETDEV_CHANGENAME: case NETDEV_CHANGENAME:
strlcpy(nt->np.dev_name, dev->name, IFNAMSIZ); strlcpy(nt->np.dev_name, dev->name, IFNAMSIZ);
break; break;
case NETDEV_BONDING_DESLAVE: case NETDEV_RELEASE:
case NETDEV_JOIN: case NETDEV_JOIN:
case NETDEV_UNREGISTER: case NETDEV_UNREGISTER:
/* /*
@@ -664,7 +664,7 @@ static int netconsole_netdev_event(struct notifier_block *this,
case NETDEV_UNREGISTER: case NETDEV_UNREGISTER:
printk(KERN_CONT "unregistered\n"); printk(KERN_CONT "unregistered\n");
break; break;
case NETDEV_BONDING_DESLAVE: case NETDEV_RELEASE:
printk(KERN_CONT "released slaves\n"); printk(KERN_CONT "released slaves\n");
break; break;
case NETDEV_JOIN: case NETDEV_JOIN:

2
include/linux/notifier.h
View File

@@ -209,7 +209,7 @@ static inline int notifier_to_errno(int ret)
#define NETDEV_POST_TYPE_CHANGE 0x000F #define NETDEV_POST_TYPE_CHANGE 0x000F
#define NETDEV_POST_INIT 0x0010 #define NETDEV_POST_INIT 0x0010
#define NETDEV_UNREGISTER_BATCH 0x0011 #define NETDEV_UNREGISTER_BATCH 0x0011
#define NETDEV_BONDING_DESLAVE 0x0012 #define NETDEV_RELEASE 0x0012
#define NETDEV_NOTIFY_PEERS 0x0013 #define NETDEV_NOTIFY_PEERS 0x0013
#define NETDEV_JOIN 0x0014 #define NETDEV_JOIN 0x0014