Commit a748ee24 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

net: move address list functions to a separate file 



+little renaming of unicast functions to be smooth with multicast ones

Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9fc4178b

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1491,7 +1491,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
			}



			/* Flush unicast and multicast addresses */

			dev_unicast_flush(bond_dev);

			dev_uc_flush(bond_dev);

			dev_addr_discard(bond_dev);



			if (slave_dev->type != ARPHRD_ETHER)

drivers/net/macvlan.c

+5 −5
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ static int macvlan_open(struct net_device *dev) 
	if (macvlan_addr_busy(vlan->port, dev->dev_addr))

		goto out;



	err = dev_unicast_add(lowerdev, dev->dev_addr);

	err = dev_uc_add(lowerdev, dev->dev_addr);

	if (err < 0)

		goto out;

	if (dev->flags & IFF_ALLMULTI) {
@@ -294,7 +294,7 @@ static int macvlan_open(struct net_device *dev) 
	return 0;



del_unicast:

	dev_unicast_delete(lowerdev, dev->dev_addr);

	dev_uc_del(lowerdev, dev->dev_addr);

out:

	return err;

}
@@ -308,7 +308,7 @@ static int macvlan_stop(struct net_device *dev) 
	if (dev->flags & IFF_ALLMULTI)

		dev_set_allmulti(lowerdev, -1);



	dev_unicast_delete(lowerdev, dev->dev_addr);

	dev_uc_del(lowerdev, dev->dev_addr);



	macvlan_hash_del(vlan);

	return 0;
@@ -332,11 +332,11 @@ static int macvlan_set_mac_address(struct net_device *dev, void *p) 
		if (macvlan_addr_busy(vlan->port, addr->sa_data))

			return -EBUSY;



		err = dev_unicast_add(lowerdev, addr->sa_data);

		err = dev_uc_add(lowerdev, addr->sa_data);

		if (err)

			return err;



		dev_unicast_delete(lowerdev, dev->dev_addr);

		dev_uc_del(lowerdev, dev->dev_addr);



		macvlan_hash_change_addr(vlan, addr->sa_data);

	}

drivers/scsi/fcoe/fcoe.c

+7 −7
Original line number Diff line number Diff line
@@ -308,9 +308,9 @@ static int fcoe_interface_setup(struct fcoe_interface *fcoe, 
	 * for multiple unicast MACs.

	 */

	memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);

	dev_unicast_add(netdev, flogi_maddr);

	dev_uc_add(netdev, flogi_maddr);

	if (fip->spma)

		dev_unicast_add(netdev, fip->ctl_src_addr);

		dev_uc_add(netdev, fip->ctl_src_addr);

	dev_mc_add(netdev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0);



	/*
@@ -394,9 +394,9 @@ void fcoe_interface_cleanup(struct fcoe_interface *fcoe) 


	/* Delete secondary MAC addresses */

	memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);

	dev_unicast_delete(netdev, flogi_maddr);

	dev_uc_del(netdev, flogi_maddr);

	if (fip->spma)

		dev_unicast_delete(netdev, fip->ctl_src_addr);

		dev_uc_del(netdev, fip->ctl_src_addr);

	dev_mc_delete(netdev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0);



	/* Tell the LLD we are done w/ FCoE */
@@ -490,9 +490,9 @@ static void fcoe_update_src_mac(struct fc_lport *lport, u8 *addr) 


	rtnl_lock();

	if (!is_zero_ether_addr(port->data_src_addr))

		dev_unicast_delete(fcoe->netdev, port->data_src_addr);

		dev_uc_del(fcoe->netdev, port->data_src_addr);

	if (!is_zero_ether_addr(addr))

		dev_unicast_add(fcoe->netdev, addr);

		dev_uc_add(fcoe->netdev, addr);

	memcpy(port->data_src_addr, addr, ETH_ALEN);

	rtnl_unlock();

}
@@ -819,7 +819,7 @@ static void fcoe_if_destroy(struct fc_lport *lport) 


	rtnl_lock();

	if (!is_zero_ether_addr(port->data_src_addr))

		dev_unicast_delete(netdev, port->data_src_addr);

		dev_uc_del(netdev, port->data_src_addr);

	rtnl_unlock();



	/* receives may not be stopped until after this */

include/linux/netdevice.h

+10 −5
Original line number Diff line number Diff line
@@ -1991,15 +1991,20 @@ extern int dev_addr_add_multiple(struct net_device *to_dev, 
extern int dev_addr_del_multiple(struct net_device *to_dev,

				 struct net_device *from_dev,

				 unsigned char addr_type);

extern void dev_addr_flush(struct net_device *dev);

extern int dev_addr_init(struct net_device *dev);



/* Functions used for unicast addresses handling */

extern int dev_uc_add(struct net_device *dev, unsigned char *addr);

extern int dev_uc_del(struct net_device *dev, unsigned char *addr);

extern int dev_uc_sync(struct net_device *to, struct net_device *from);

extern void dev_uc_unsync(struct net_device *to, struct net_device *from);

extern void dev_uc_flush(struct net_device *dev);

extern void dev_uc_init(struct net_device *dev);



/* Functions used for secondary unicast and multicast support */

extern void		dev_set_rx_mode(struct net_device *dev);

extern void		__dev_set_rx_mode(struct net_device *dev);

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);

net/8021q/vlan.c

+2 −2
Original line number Diff line number Diff line
@@ -356,13 +356,13 @@ static void vlan_sync_address(struct net_device *dev, 
	 * the new address */

	if (compare_ether_addr(vlandev->dev_addr, vlan->real_dev_addr) &&

	    !compare_ether_addr(vlandev->dev_addr, dev->dev_addr))

		dev_unicast_delete(dev, vlandev->dev_addr);

		dev_uc_del(dev, vlandev->dev_addr);



	/* vlan address was equal to the old address and is different from

	 * the new address */

	if (!compare_ether_addr(vlandev->dev_addr, vlan->real_dev_addr) &&

	    compare_ether_addr(vlandev->dev_addr, dev->dev_addr))

		dev_unicast_add(dev, vlandev->dev_addr);

		dev_uc_add(dev, vlandev->dev_addr);



	memcpy(vlan->real_dev_addr, dev->dev_addr, ETH_ALEN);

}