bonding: flush unicast and multicast lists when changing type
Subsystems (3)
PATCH 1/1 bonding: flush unicast and multicast lists when changing type
After the type change, addresses in unicast and multicast lists wouldn't make sense, not to mention possible different lenghts. So flush both lists here.
Note "dev_addr_discard" will be very soon replaced by "dev_mc_flush" (once mc_list conversion will be done).
--- drivers/net/bonding/bond_main.c | 4 ++++ include/linux/netdevice.h | 2 ++ net/core/dev.c | 6 ++++-- 3 files changed, 10 insertions(+), 2 deletions(-)
drivers/net/bonding/bond_main.c +4 -0
@@ -1490,6 +1490,10 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) goto err_undo_flags; } +/* Flush unicast and multicast addresses */ +dev_unicast_flush (bond_dev); +dev_addr_discard (bond_dev); +if (slave_dev->type !=ARPHRD_ETHER )bond_setup_by_slave (bond_dev, slave_dev);else
include/linux/netdevice.h +2 -0
@@ -1994,10 +1994,12 @@ extern int dev_unicast_delete(struct net_device *dev, void *addr);extern int dev_unicast_add (struct net_device *dev,void *addr);extern int dev_unicast_sync (struct net_device *to,struct net_device *from);extern void dev_unicast_unsync (struct net_device *to,struct net_device *from); +extern void dev_unicast_flush (struct net_device *dev);extern int dev_mc_delete (struct net_device *dev,void *addr,int alen,int all);extern int dev_mc_add (struct net_device *dev,void *addr,int alen,int newonly);extern int dev_mc_sync (struct net_device *to,struct net_device *from);extern void dev_mc_unsync (struct net_device *to,struct net_device *from); +extern void dev_addr_discard (struct net_device *dev);extern int __dev_addr_delete (struct dev_addr_list **list,int *count,void *addr,int alen,int all);extern int __dev_addr_add (struct dev_addr_list **list,int *count,void *addr,int alen,int newonly);extern int __dev_addr_sync (struct dev_addr_list **to,int *to_count,struct dev_addr_list **from,int *from_count);
net/core/dev.c +4 -2
@@ -4455,12 +4455,13 @@ void dev_unicast_unsync(struct net_device *to, struct net_device *from) }EXPORT_SYMBOL (dev_unicast_unsync); -static void dev_unicast_flush (struct net_device *dev) +void dev_unicast_flush (struct net_device *dev) {netif_addr_lock_bh (dev);__hw_addr_flush (&dev->uc);netif_addr_unlock_bh (dev); } +EXPORT_SYMBOL (dev_unicast_flush);static void dev_unicast_init (struct net_device *dev) {
@@ -4482,7 +4483,7 @@ static void __dev_addr_discard(struct dev_addr_list **list) } } -static void dev_addr_discard (struct net_device *dev) +void dev_addr_discard (struct net_device *dev) {netif_addr_lock_bh (dev);
@@ -4491,6 +4492,7 @@ static void dev_addr_discard(struct net_device *dev)netif_addr_unlock_bh (dev); } +EXPORT_SYMBOL (dev_addr_discard);/** * dev_get_flags - get flags reported to userspace
Signature · 1 line
1.6.6.1
From: Jiri Pirko <[email protected]>
Date: Fri, 19 Mar 2010 15:00:23 +0100
Quoted 7 lines
After the type change, addresses in unicast and multicast lists wouldn't make sense, not to mention possible different lenghts. So flush both lists here.
Note "
dev_addr_discard" will be very soon replaced by "dev_mc_flush" (oncemc_listconversion will be done).Signed-off-by Jiri Pirko <[email protected]>
Applied, but maybe these should be EXPORT_SYMBOL_GPL? Just asking...
Quoted 6 lines · Mon, Mar 22, 2010 at 02:32:20AM CET, [email protected] wrote:
From: Jiri Pirko <[email protected]>
Date: Fri, 19 Mar 2010 15:00:23 +0100Quoted 3 lines
After the type change, addresses in unicast and multicast lists wouldn't make sense, not to mention possible different lenghts. So flush both lists here.
Quoted 7 lines
Quoted 4 lines
Note "
dev_addr_discard" will be very soon replaced by "dev_mc_flush" (oncemc_listconversion will be done).Signed-off-by Jiri Pirko <[email protected]>Applied, but maybe these should be
EXPORT_SYMBOL_GPL? Just asking...
I would keep them EXPORT_SYMBOL as other uc/mc list functions...