netdev - Re: [net-next-2.6 PATCH 1/3] rename notifier defines for netdev type change

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 9 Mar 2010 23:00:22 +0100
From:	Jiri Pirko <jpirko@...hat.com>
To:	netdev@...r.kernel.org
Cc:	fubar@...ibm.com, bonding-devel@...ts.sourceforge.net,
	davem@...emloft.net, shemminger@...ux-foundation.org
Subject: Re: [net-next-2.6 PATCH 1/3] rename notifier defines for netdev type
 change

Hmm, maybe even better would be
NETDEV_PRE_TYPE_CHANGE
and
NETDEV_POST_TYPE_CHANGE


Tue, Mar 09, 2010 at 03:18:38PM CET, jpirko@...hat.com wrote:
>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@...hat.com>
>---
> drivers/net/bonding/bond_main.c |    4 ++--
> include/linux/notifier.h        |    4 ++--
> net/ipv4/devinet.c              |    4 ++--
> net/ipv6/addrconf.c             |   16 ++++++++--------
> 4 files changed, 14 insertions(+), 14 deletions(-)
>
>diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
>index 430c022..c1b39b7 100644
>--- a/drivers/net/bonding/bond_main.c
>+++ b/drivers/net/bonding/bond_main.c
>@@ -1480,14 +1480,14 @@ 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_TYPE_CHNG_START);
> 
> 			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_TYPE_CHNG_DONE);
> 		}
> 	} 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 fee6c2f..c8145c2 100644
>--- 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_TYPE_CHNG_START	0x000E
>+#define NETDEV_TYPE_CHNG_DONE	0x000F
> #define NETDEV_POST_INIT	0x0010
> #define NETDEV_UNREGISTER_BATCH 0x0011
> 
>diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
>index 51ca946..16bfc45 100644
>--- 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_TYPE_CHNG_START:
> 		ip_mc_unmap(in_dev);
> 		break;
>-	case NETDEV_BONDING_NEWTYPE:
>+	case NETDEV_TYPE_CHNG_DONE:
> 		ip_mc_remap(in_dev);
> 		break;
> 	case NETDEV_CHANGEMTU:
>diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
>index 88fd8c5..b2409ac 100644
>--- 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);
>@@ -2582,9 +2582,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_TYPE_CHNG_START:
>+	case NETDEV_TYPE_CHNG_DONE:
>+		addrconf_type_change(dev, event);
> 		break;
> 	}
> 
>@@ -2599,16 +2599,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_TYPE_CHNG_DONE)
> 		ipv6_mc_remap(idev);
>-	else if (event == NETDEV_BONDING_OLDTYPE)
>+	else if (event == NETDEV_TYPE_CHNG_START)
> 		ipv6_mc_unmap(idev);
> }
> 
>-- 
>1.6.6.1
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html