Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Amerigo Wang and committed by
David S. Miller
daf9209b bb8ed630

+5 -5
+1 -1
drivers/net/bonding/bond_main.c
··· 1974 1974 } 1975 1975 1976 1976 block_netpoll_tx(); 1977 - netdev_bonding_change(bond_dev, NETDEV_BONDING_DESLAVE); 1977 + netdev_bonding_change(bond_dev, NETDEV_RELEASE); 1978 1978 write_lock_bh(&bond->lock); 1979 1979 1980 1980 slave = bond_get_slave_by_dev(bond, slave_dev);
+3 -3
drivers/net/netconsole.c
··· 621 621 bool stopped = false; 622 622 623 623 if (!(event == NETDEV_CHANGENAME || event == NETDEV_UNREGISTER || 624 - event == NETDEV_BONDING_DESLAVE || event == NETDEV_JOIN)) 624 + event == NETDEV_RELEASE || event == NETDEV_JOIN)) 625 625 goto done; 626 626 627 627 spin_lock_irqsave(&target_list_lock, flags); ··· 632 632 case NETDEV_CHANGENAME: 633 633 strlcpy(nt->np.dev_name, dev->name, IFNAMSIZ); 634 634 break; 635 - case NETDEV_BONDING_DESLAVE: 635 + case NETDEV_RELEASE: 636 636 case NETDEV_JOIN: 637 637 case NETDEV_UNREGISTER: 638 638 /* ··· 664 664 case NETDEV_UNREGISTER: 665 665 printk(KERN_CONT "unregistered\n"); 666 666 break; 667 - case NETDEV_BONDING_DESLAVE: 667 + case NETDEV_RELEASE: 668 668 printk(KERN_CONT "released slaves\n"); 669 669 break; 670 670 case NETDEV_JOIN:
+1 -1
include/linux/notifier.h
··· 209 209 #define NETDEV_POST_TYPE_CHANGE 0x000F 210 210 #define NETDEV_POST_INIT 0x0010 211 211 #define NETDEV_UNREGISTER_BATCH 0x0011 212 - #define NETDEV_BONDING_DESLAVE 0x0012 212 + #define NETDEV_RELEASE 0x0012 213 213 #define NETDEV_NOTIFY_PEERS 0x0013 214 214 #define NETDEV_JOIN 0x0014 215 215