hamradio: use dev_addr_set() for setting device address

Use dev_addr_set() instead of writing to netdev->dev_addr
directly in hamradio drivers.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 6192244..f4e8793 100644 (file)
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -288,7 +288,7 @@ static int sp_set_mac_address(struct net_device *dev, void *addr)
 
        netif_tx_lock_bh(dev);
        netif_addr_lock(dev);
-       memcpy(dev->dev_addr, &sa->sax25_call, AX25_ADDR_LEN);
+       __dev_addr_set(dev, &sa->sax25_call, AX25_ADDR_LEN);
        netif_addr_unlock(dev);
        netif_tx_unlock_bh(dev);
 
@@ -317,7 +317,7 @@ static void sp_setup(struct net_device *dev)
 
        /* Only activated in AX.25 mode */
        memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);
-       memcpy(dev->dev_addr, &ax25_defaddr, AX25_ADDR_LEN);
+       dev_addr_set(dev, (u8 *)&ax25_defaddr);
 
        dev->flags              = 0;
 }
@@ -726,7 +726,7 @@ static int sixpack_ioctl(struct tty_struct *tty, struct file *file,
                        }
 
                        netif_tx_lock_bh(dev);
-                       memcpy(dev->dev_addr, &addr, AX25_ADDR_LEN);
+                       __dev_addr_set(dev, &addr, AX25_ADDR_LEN);
                        netif_tx_unlock_bh(dev);
                        err = 0;
                        break;

diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
index f6428ff..62da837 100644 (file)
--- a/drivers/net/hamradio/baycom_epp.c
+++ b/drivers/net/hamradio/baycom_epp.c
@@ -1159,7 +1159,7 @@ static void baycom_probe(struct net_device *dev)
        dev->mtu = AX25_DEF_PACLEN;        /* eth_mtu is the default */
        dev->addr_len = AX25_ADDR_LEN;     /* sizeof an ax.25 address */
        memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);
-       memcpy(dev->dev_addr, &null_ax25_address, AX25_ADDR_LEN);
+       dev_addr_set(dev, (u8 *)&null_ax25_address);
        dev->tx_queue_len = 16;
 
        /* New style flags */

diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index 1ac8161..30af008 100644 (file)
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -457,9 +457,6 @@ static void bpq_setup(struct net_device *dev)
        dev->netdev_ops      = &bpq_netdev_ops;
        dev->needs_free_netdev = true;
 
-       memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);
-       memcpy(dev->dev_addr,  &ax25_defaddr, AX25_ADDR_LEN);
-
        dev->flags      = 0;
        dev->features   = NETIF_F_LLTX; /* Allow recursion */
 
@@ -472,6 +469,8 @@ static void bpq_setup(struct net_device *dev)
        dev->mtu             = AX25_DEF_PACLEN;
        dev->addr_len        = AX25_ADDR_LEN;
 
+       memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);
+       dev_addr_set(dev, (u8 *)&ax25_defaddr);
 }
 
 /*

diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index a4ba1b7..7e52749 100644 (file)
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -426,7 +426,7 @@ static void __init dev_setup(struct net_device *dev)
        dev->addr_len = AX25_ADDR_LEN;
        dev->tx_queue_len = 64;
        memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);
-       memcpy(dev->dev_addr, &ax25_defaddr, AX25_ADDR_LEN);
+       dev_addr_set(dev, (u8 *)&ax25_defaddr);
 }
 
 static const struct net_device_ops scc_netdev_ops = {

diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c
index ab5327a..b0edb91 100644 (file)
--- a/drivers/net/hamradio/hdlcdrv.c
+++ b/drivers/net/hamradio/hdlcdrv.c
@@ -675,7 +675,7 @@ static void hdlcdrv_setup(struct net_device *dev)
        dev->mtu = AX25_DEF_PACLEN;        /* eth_mtu is the default */
        dev->addr_len = AX25_ADDR_LEN;     /* sizeof an ax.25 address */
        memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);
-       memcpy(dev->dev_addr, &ax25_defaddr, AX25_ADDR_LEN);
+       dev_addr_set(dev, (u8 *)&ax25_defaddr);
        dev->tx_queue_len = 16;
 }
 

diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index 8666110..867252a 100644 (file)
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -344,7 +344,7 @@ static int ax_set_mac_address(struct net_device *dev, void *addr)
 
        netif_tx_lock_bh(dev);
        netif_addr_lock(dev);
-       memcpy(dev->dev_addr, &sa->sax25_call, AX25_ADDR_LEN);
+       __dev_addr_set(dev, &sa->sax25_call, AX25_ADDR_LEN);
        netif_addr_unlock(dev);
        netif_tx_unlock_bh(dev);
 
@@ -647,7 +647,7 @@ static void ax_setup(struct net_device *dev)
 
 
        memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);
-       memcpy(dev->dev_addr,  &ax25_defaddr,  AX25_ADDR_LEN);
+       dev_addr_set(dev, (u8 *)&ax25_defaddr);
 
        dev->flags      = IFF_BROADCAST | IFF_MULTICAST;
 }
@@ -850,7 +850,7 @@ static int mkiss_ioctl(struct tty_struct *tty, struct file *file,
                }
 
                netif_tx_lock_bh(dev);
-               memcpy(dev->dev_addr, addr, AX25_ADDR_LEN);
+               __dev_addr_set(dev, addr, AX25_ADDR_LEN);
                netif_tx_unlock_bh(dev);
 
                err = 0;

diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index 9b745d0..3d59dac 100644 (file)
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -1563,9 +1563,6 @@ static void scc_net_setup(struct net_device *dev)
        dev->netdev_ops      = &scc_netdev_ops;
        dev->header_ops      = &ax25_header_ops;
 
-       memcpy(dev->broadcast, &ax25_bcast,  AX25_ADDR_LEN);
-       memcpy(dev->dev_addr,  &ax25_defaddr, AX25_ADDR_LEN);
- 
        dev->flags      = 0;
 
        dev->type = ARPHRD_AX25;
@@ -1573,6 +1570,8 @@ static void scc_net_setup(struct net_device *dev)
        dev->mtu = AX25_DEF_PACLEN;
        dev->addr_len = AX25_ADDR_LEN;
 
+       memcpy(dev->broadcast, &ax25_bcast,  AX25_ADDR_LEN);
+       dev_addr_set(dev, (u8 *)&ax25_defaddr);
 }
 
 /* ----> open network device <---- */

diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index e557ccf..6376b84 100644 (file)
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -1107,7 +1107,7 @@ static void yam_setup(struct net_device *dev)
        dev->mtu = AX25_MTU;
        dev->addr_len = AX25_ADDR_LEN;
        memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);
-       memcpy(dev->dev_addr, &ax25_defaddr, AX25_ADDR_LEN);
+       dev_addr_set(dev, (u8 *)&ax25_defaddr);
 }
 
 static int __init yam_init_driver(void)