diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2010-03-10 10:28:56 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-18 20:00:01 -0700 |
| commit | 93d9b7d7a85cfb4e1711d5226eba73586dd4919f (patch) | |
| tree | e821e36c2d2eb07cdc46df1d3b1ea23afaf970ca /drivers/net/bonding | |
| parent | 1e94d72feab025b8f7c55d07020602f82f3a97dd (diff) | |
| download | op-kernel-dev-93d9b7d7a85cfb4e1711d5226eba73586dd4919f.zip op-kernel-dev-93d9b7d7a85cfb4e1711d5226eba73586dd4919f.tar.gz | |
net: rename notifier defines for netdev type change
Since generally there could be more netdevices changing type other
than bonding, making this event type name "bonding-unrelated"
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 430c022..7eeb187 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1480,14 +1480,16 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) bond_dev->name, bond_dev->type, slave_dev->type); - netdev_bonding_change(bond_dev, NETDEV_BONDING_OLDTYPE); + netdev_bonding_change(bond_dev, + NETDEV_PRE_TYPE_CHANGE); if (slave_dev->type != ARPHRD_ETHER) bond_setup_by_slave(bond_dev, slave_dev); else ether_setup(bond_dev); - netdev_bonding_change(bond_dev, NETDEV_BONDING_NEWTYPE); + netdev_bonding_change(bond_dev, + NETDEV_POST_TYPE_CHANGE); } } else if (bond_dev->type != slave_dev->type) { pr_err("%s ether type (%d) is different from other slaves (%d), can not enslave it.\n", |
