tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

net: atm: use address setting helpers

Get it ready for constant netdev->dev_addr.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Jakub Kicinski and committed by
David S. Miller d6b3daf2 8bc7823e

+5 -4
+3 -1
net/atm/br2684.c
··· 577 577 pr_debug("vcc=%p, encaps=%d, brvcc=%p\n", atmvcc, be.encaps, brvcc); 578 578 if (list_empty(&brdev->brvccs) && !brdev->mac_was_set) { 579 579 unsigned char *esi = atmvcc->dev->esi; 580 + const u8 one = 1; 581 + 580 582 if (esi[0] | esi[1] | esi[2] | esi[3] | esi[4] | esi[5]) 581 583 dev_addr_set(net_dev, esi); 582 584 else 583 - net_dev->dev_addr[2] = 1; 585 + dev_addr_mod(net_dev, 2, &one, 1); 584 586 } 585 587 list_add(&brvcc->brvccs, &brdev->brvccs); 586 588 write_unlock_irq(&devs_lock);
+2 -3
net/atm/lec.c
··· 340 340 341 341 static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb) 342 342 { 343 + static const u8 zero_addr[ETH_ALEN] = {}; 343 344 unsigned long flags; 344 345 struct net_device *dev = (struct net_device *)vcc->proto_data; 345 346 struct lec_priv *priv = netdev_priv(dev); 346 347 struct atmlec_msg *mesg; 347 348 struct lec_arp_table *entry; 348 - int i; 349 349 char *tmp; /* FIXME */ 350 350 351 351 WARN_ON(refcount_sub_and_test(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc)); ··· 358 358 eth_hw_addr_set(dev, mesg->content.normal.mac_addr); 359 359 break; 360 360 case l_del_mac_addr: 361 - for (i = 0; i < 6; i++) 362 - dev->dev_addr[i] = 0; 361 + eth_hw_addr_set(dev, zero_addr); 363 362 break; 364 363 case l_addr_delete: 365 364 lec_addr_delete(priv, mesg->content.normal.atm_addr,