diff options
author | Jiri Pirko <jpirko@redhat.com> | 2010-03-10 05:28:56 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-18 23:00:01 -0400 |
commit | 93d9b7d7a85cfb4e1711d5226eba73586dd4919f (patch) | |
tree | e821e36c2d2eb07cdc46df1d3b1ea23afaf970ca /drivers/net/bonding/bond_main.c | |
parent | 1e94d72feab025b8f7c55d07020602f82f3a97dd (diff) |
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/bond_main.c')
-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 430c02267d7e..7eeb18751d67 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) | |||
1480 | bond_dev->name, | 1480 | bond_dev->name, |
1481 | bond_dev->type, slave_dev->type); | 1481 | bond_dev->type, slave_dev->type); |
1482 | 1482 | ||
1483 | netdev_bonding_change(bond_dev, NETDEV_BONDING_OLDTYPE); | 1483 | netdev_bonding_change(bond_dev, |
1484 | NETDEV_PRE_TYPE_CHANGE); | ||
1484 | 1485 | ||
1485 | if (slave_dev->type != ARPHRD_ETHER) | 1486 | if (slave_dev->type != ARPHRD_ETHER) |
1486 | bond_setup_by_slave(bond_dev, slave_dev); | 1487 | bond_setup_by_slave(bond_dev, slave_dev); |
1487 | else | 1488 | else |
1488 | ether_setup(bond_dev); | 1489 | ether_setup(bond_dev); |
1489 | 1490 | ||
1490 | netdev_bonding_change(bond_dev, NETDEV_BONDING_NEWTYPE); | 1491 | netdev_bonding_change(bond_dev, |
1492 | NETDEV_POST_TYPE_CHANGE); | ||
1491 | } | 1493 | } |
1492 | } else if (bond_dev->type != slave_dev->type) { | 1494 | } else if (bond_dev->type != slave_dev->type) { |
1493 | pr_err("%s ether type (%d) is different from other slaves (%d), can not enslave it.\n", | 1495 | pr_err("%s ether type (%d) is different from other slaves (%d), can not enslave it.\n", |