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>

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 430c02267d7e9ec26d3c8b59922d919fc5fedb97..7eeb18751d67592eef914e92bbff7f35b2819f65 100644 (file)
--- 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",

diff --git a/include/linux/notifier.h b/include/linux/notifier.h
index fee6c2f68075c90fe77cea11138d627bd9efa4f5..f3635fc6e9427198a5908b6d9c6eb0ad104b1265 100644 (file)
--- a/include/linux/notifier.h
+++ b/include/linux/notifier.h
@@ -199,8 +199,8 @@ static inline int notifier_to_errno(int ret)
 #define NETDEV_FEAT_CHANGE     0x000B
 #define NETDEV_BONDING_FAILOVER 0x000C
 #define NETDEV_PRE_UP          0x000D
-#define NETDEV_BONDING_OLDTYPE  0x000E
-#define NETDEV_BONDING_NEWTYPE  0x000F
+#define NETDEV_PRE_TYPE_CHANGE 0x000E
+#define NETDEV_POST_TYPE_CHANGE        0x000F
 #define NETDEV_POST_INIT       0x0010
 #define NETDEV_UNREGISTER_BATCH 0x0011
 

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 51ca946e339268b58181870695906e1f29257d85..c75320ef95c2f628d2e84e9beababa03e3d344fa 100644 (file)
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1095,10 +1095,10 @@ static int inetdev_event(struct notifier_block *this, unsigned long event,
        case NETDEV_DOWN:
                ip_mc_down(in_dev);
                break;
-       case NETDEV_BONDING_OLDTYPE:
+       case NETDEV_PRE_TYPE_CHANGE:
                ip_mc_unmap(in_dev);
                break;
-       case NETDEV_BONDING_NEWTYPE:
+       case NETDEV_POST_TYPE_CHANGE:
                ip_mc_remap(in_dev);
                break;
        case NETDEV_CHANGEMTU:

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 3381b4317c270230a7c44ee7d57daf6ac4345897..8d41abc40db5c2c541da0a5505066525e5caa8c5 100644 (file)
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -137,8 +137,8 @@ static DEFINE_SPINLOCK(addrconf_verify_lock);
 static void addrconf_join_anycast(struct inet6_ifaddr *ifp);
 static void addrconf_leave_anycast(struct inet6_ifaddr *ifp);
 
-static void addrconf_bonding_change(struct net_device *dev,
-                                   unsigned long event);
+static void addrconf_type_change(struct net_device *dev,
+                                unsigned long event);
 static int addrconf_ifdown(struct net_device *dev, int how);
 
 static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags);
@@ -2584,9 +2584,9 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,
                                return notifier_from_errno(err);
                }
                break;
-       case NETDEV_BONDING_OLDTYPE:
-       case NETDEV_BONDING_NEWTYPE:
-               addrconf_bonding_change(dev, event);
+       case NETDEV_PRE_TYPE_CHANGE:
+       case NETDEV_POST_TYPE_CHANGE:
+               addrconf_type_change(dev, event);
                break;
        }
 
@@ -2601,16 +2601,16 @@ static struct notifier_block ipv6_dev_notf = {
        .priority = 0
 };
 
-static void addrconf_bonding_change(struct net_device *dev, unsigned long event)
+static void addrconf_type_change(struct net_device *dev, unsigned long event)
 {
        struct inet6_dev *idev;
        ASSERT_RTNL();
 
        idev = __in6_dev_get(dev);
 
-       if (event == NETDEV_BONDING_NEWTYPE)
+       if (event == NETDEV_POST_TYPE_CHANGE)
                ipv6_mc_remap(idev);
-       else if (event == NETDEV_BONDING_OLDTYPE)
+       else if (event == NETDEV_PRE_TYPE_CHANGE)
                ipv6_mc_unmap(idev);
 }