diff options
Diffstat (limited to 'drivers/net/arcnet')
| -rw-r--r-- | drivers/net/arcnet/arc-rimi.c | 5 | ||||
| -rw-r--r-- | drivers/net/arcnet/arcdevice.h | 5 | ||||
| -rw-r--r-- | drivers/net/arcnet/com20020-isa.c | 2 | ||||
| -rw-r--r-- | drivers/net/arcnet/com20020-pci.c | 2 | ||||
| -rw-r--r-- | drivers/net/arcnet/com20020.c | 4 | ||||
| -rw-r--r-- | drivers/net/arcnet/com20020_cs.c | 2 | ||||
| -rw-r--r-- | drivers/net/arcnet/com90io.c | 2 | ||||
| -rw-r--r-- | drivers/net/arcnet/com90xx.c | 3 |
8 files changed, 16 insertions, 9 deletions
diff --git a/drivers/net/arcnet/arc-rimi.c b/drivers/net/arcnet/arc-rimi.c index 12d085405bd0..8c3ccc7c83cd 100644 --- a/drivers/net/arcnet/arc-rimi.c +++ b/drivers/net/arcnet/arc-rimi.c @@ -207,7 +207,8 @@ static int __init arcrimi_found(struct net_device *dev) } /* get and check the station ID from offset 1 in shmem */ - dev->dev_addr[0] = arcnet_readb(lp->mem_start, COM9026_REG_R_STATION); + arcnet_set_addr(dev, arcnet_readb(lp->mem_start, + COM9026_REG_R_STATION)); arc_printk(D_NORMAL, dev, "ARCnet RIM I: station %02Xh found at IRQ %d, ShMem %lXh (%ld*%d bytes)\n", dev->dev_addr[0], @@ -324,7 +325,7 @@ static int __init arc_rimi_init(void) return -ENOMEM; if (node && node != 0xff) - dev->dev_addr[0] = node; + arcnet_set_addr(dev, node); dev->mem_start = io; dev->irq = irq; diff --git a/drivers/net/arcnet/arcdevice.h b/drivers/net/arcnet/arcdevice.h index 5d4a4c7efbbf..19e996a829c9 100644 --- a/drivers/net/arcnet/arcdevice.h +++ b/drivers/net/arcnet/arcdevice.h @@ -364,6 +364,11 @@ netdev_tx_t arcnet_send_packet(struct sk_buff *skb, struct net_device *dev); void arcnet_timeout(struct net_device *dev, unsigned int txqueue); +static inline void arcnet_set_addr(struct net_device *dev, u8 addr) +{ + dev_addr_set(dev, &addr); +} + /* I/O equivalents */ #ifdef CONFIG_SA1100_CT6001 diff --git a/drivers/net/arcnet/com20020-isa.c b/drivers/net/arcnet/com20020-isa.c index be618e4b9ed5..293a621e654c 100644 --- a/drivers/net/arcnet/com20020-isa.c +++ b/drivers/net/arcnet/com20020-isa.c @@ -151,7 +151,7 @@ static int __init com20020_init(void) return -ENOMEM; if (node && node != 0xff) - dev->dev_addr[0] = node; + arcnet_set_addr(dev, node); dev->netdev_ops = &com20020_netdev_ops; diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c index 3c8f665c1558..6382e1937cca 100644 --- a/drivers/net/arcnet/com20020-pci.c +++ b/drivers/net/arcnet/com20020-pci.c @@ -194,7 +194,7 @@ static int com20020pci_probe(struct pci_dev *pdev, SET_NETDEV_DEV(dev, &pdev->dev); dev->base_addr = ioaddr; - dev->dev_addr[0] = node; + arcnet_set_addr(dev, node); dev->sysfs_groups[0] = &com20020_state_group; dev->irq = pdev->irq; lp->card_name = "PCI COM20020"; diff --git a/drivers/net/arcnet/com20020.c b/drivers/net/arcnet/com20020.c index 78043a9c5981..06e1651b594b 100644 --- a/drivers/net/arcnet/com20020.c +++ b/drivers/net/arcnet/com20020.c @@ -157,7 +157,7 @@ static int com20020_set_hwaddr(struct net_device *dev, void *addr) struct arcnet_local *lp = netdev_priv(dev); struct sockaddr *hwaddr = addr; - memcpy(dev->dev_addr, hwaddr->sa_data, 1); + dev_addr_set(dev, hwaddr->sa_data); com20020_set_subaddress(lp, ioaddr, SUB_NODE); arcnet_outb(dev->dev_addr[0], ioaddr, COM20020_REG_W_XREG); @@ -220,7 +220,7 @@ int com20020_found(struct net_device *dev, int shared) /* FIXME: do this some other way! */ if (!dev->dev_addr[0]) - dev->dev_addr[0] = arcnet_inb(ioaddr, 8); + arcnet_set_addr(dev, arcnet_inb(ioaddr, 8)); com20020_set_subaddress(lp, ioaddr, SUB_SETUP1); arcnet_outb(lp->setup, ioaddr, COM20020_REG_W_XREG); diff --git a/drivers/net/arcnet/com20020_cs.c b/drivers/net/arcnet/com20020_cs.c index b88a109b3b15..24150c933fcb 100644 --- a/drivers/net/arcnet/com20020_cs.c +++ b/drivers/net/arcnet/com20020_cs.c @@ -133,7 +133,7 @@ static int com20020_probe(struct pcmcia_device *p_dev) lp->hw.owner = THIS_MODULE; /* fill in our module parameters as defaults */ - dev->dev_addr[0] = node; + arcnet_set_addr(dev, node); p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; p_dev->resource[0]->end = 16; diff --git a/drivers/net/arcnet/com90io.c b/drivers/net/arcnet/com90io.c index 3856b447d38e..37b47749fc8b 100644 --- a/drivers/net/arcnet/com90io.c +++ b/drivers/net/arcnet/com90io.c @@ -252,7 +252,7 @@ static int __init com90io_found(struct net_device *dev) /* get and check the station ID from offset 1 in shmem */ - dev->dev_addr[0] = get_buffer_byte(dev, 1); + arcnet_set_addr(dev, get_buffer_byte(dev, 1)); err = register_netdev(dev); if (err) { diff --git a/drivers/net/arcnet/com90xx.c b/drivers/net/arcnet/com90xx.c index d8dfb9ea0de8..f49dae194284 100644 --- a/drivers/net/arcnet/com90xx.c +++ b/drivers/net/arcnet/com90xx.c @@ -531,7 +531,8 @@ static int __init com90xx_found(int ioaddr, int airq, u_long shmem, } /* get and check the station ID from offset 1 in shmem */ - dev->dev_addr[0] = arcnet_readb(lp->mem_start, COM9026_REG_R_STATION); + arcnet_set_addr(dev, arcnet_readb(lp->mem_start, + COM9026_REG_R_STATION)); dev->base_addr = ioaddr; |