Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit daf9209b authored by Amerigo Wang's avatar Amerigo Wang Committed by David S. Miller
Browse files

net: rename NETDEV_BONDING_DESLAVE to NETDEV_RELEASE 



s/NETDEV_BONDING_DESLAVE/NETDEV_RELEASE/ as Andy suggested.

Signed-off-by: default avatarWANG Cong <amwang@redhat.com>
Cc: Andy Gospodarek <andy@greyhouse.net>
Cc: Neil Horman <nhorman@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bb8ed630

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1974,7 +1974,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev) 
	}



	block_netpoll_tx();

	netdev_bonding_change(bond_dev, NETDEV_BONDING_DESLAVE);

	netdev_bonding_change(bond_dev, NETDEV_RELEASE);

	write_lock_bh(&bond->lock);



	slave = bond_get_slave_by_dev(bond, slave_dev);

drivers/net/netconsole.c

+3 −3
Original line number Diff line number Diff line
@@ -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:

include/linux/notifier.h

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static inline int notifier_to_errno(int ret) 
#define NETDEV_POST_TYPE_CHANGE	0x000F

#define NETDEV_POST_INIT	0x0010

#define NETDEV_UNREGISTER_BATCH 0x0011

#define NETDEV_BONDING_DESLAVE  0x0012

#define NETDEV_RELEASE		0x0012

#define NETDEV_NOTIFY_PEERS	0x0013

#define NETDEV_JOIN		0x0014