diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-10-22 16:21:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-10-24 13:59:45 +0100 |
| commit | d6b3daf24e7514c043404cb142f96c83c735cbb2 (patch) | |
| tree | b7e4ff091b5c7db7414836130eb771b0d03b5a60 | |
| parent | 8bc7823ed3bd5b87765e1b3d6f72c69624680921 (diff) | |
| download | linux-stable-d6b3daf24e7514c043404cb142f96c83c735cbb2.tar.gz linux-stable-d6b3daf24e7514c043404cb142f96c83c735cbb2.tar.bz2 linux-stable-d6b3daf24e7514c043404cb142f96c83c735cbb2.zip | |
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>
| -rw-r--r-- | net/atm/br2684.c | 4 | ||||
| -rw-r--r-- | net/atm/lec.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/net/atm/br2684.c b/net/atm/br2684.c index 11854fde52db..f666f2f98ba5 100644 --- a/net/atm/br2684.c +++ b/net/atm/br2684.c @@ -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); diff --git a/net/atm/lec.c b/net/atm/lec.c index 8eaea4a4bbd6..6257bf12e5a0 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c @@ -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, |