Skip to content

Commit

Permalink
hamradio: use dev_addr_set() for setting device address
Browse files Browse the repository at this point in the history 
Use dev_addr_set() instead of writing to netdev->dev_addr
directly in hamradio drivers.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Jakub Kicinski committed Oct 13, 2021
1 parent 40af35f commit 20c3d9e
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 16 deletions.
6 changes: 3 additions & 3 deletions drivers/net/hamradio/6pack.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/hamradio/baycom_epp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
5 changes: 2 additions & 3 deletions drivers/net/hamradio/bpqether.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand All @@ -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);
}

/*
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/hamradio/dmascc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/hamradio/hdlcdrv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
6 changes: 3 additions & 3 deletions drivers/net/hamradio/mkiss.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions drivers/net/hamradio/scc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1563,16 +1563,15 @@ 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;
dev->hard_header_len = AX25_MAX_HEADER_LEN + AX25_BPQ_HEADER_LEN;
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 <---- */
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/hamradio/yam.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 20c3d9e

Please sign in to comment.