Commit d6b3daf2 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

net: atm: use address setting helpers 



Get it ready for constant netdev->dev_addr.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8bc7823e

net/atm/br2684.c

+3 −1
Original line number Diff line number Diff line
@@ -577,10 +577,12 @@ static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg) 
	pr_debug("vcc=%p, encaps=%d, brvcc=%p\n", atmvcc, be.encaps, brvcc);

	if (list_empty(&brdev->brvccs) && !brdev->mac_was_set) {

		unsigned char *esi = atmvcc->dev->esi;

		const u8 one = 1;



		if (esi[0] | esi[1] | esi[2] | esi[3] | esi[4] | esi[5])

			dev_addr_set(net_dev, esi);

		else

			net_dev->dev_addr[2] = 1;

			dev_addr_mod(net_dev, 2, &one, 1);

	}

	list_add(&brvcc->brvccs, &brdev->brvccs);

	write_unlock_irq(&devs_lock);

net/atm/lec.c

+2 −3
Original line number Diff line number Diff line
@@ -340,12 +340,12 @@ static int lec_close(struct net_device *dev) 


static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)

{

	static const u8 zero_addr[ETH_ALEN] = {};

	unsigned long flags;

	struct net_device *dev = (struct net_device *)vcc->proto_data;

	struct lec_priv *priv = netdev_priv(dev);

	struct atmlec_msg *mesg;

	struct lec_arp_table *entry;

	int i;

	char *tmp;		/* FIXME */



	WARN_ON(refcount_sub_and_test(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc));
@@ -358,8 +358,7 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb) 
		eth_hw_addr_set(dev, mesg->content.normal.mac_addr);

		break;

	case l_del_mac_addr:

		for (i = 0; i < 6; i++)

			dev->dev_addr[i] = 0;

		eth_hw_addr_set(dev, zero_addr);

		break;

	case l_addr_delete:

		lec_addr_delete(priv, mesg->content.normal.atm_addr,