diff options
Diffstat (limited to 'drivers/net/fddi/skfp/skfddi.c')
| -rw-r--r-- | drivers/net/fddi/skfp/skfddi.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/fddi/skfp/skfddi.c b/drivers/net/fddi/skfp/skfddi.c index c5cb421f9890..2b6a607ac0b7 100644 --- a/drivers/net/fddi/skfp/skfddi.c +++ b/drivers/net/fddi/skfp/skfddi.c @@ -78,6 +78,7 @@ static const char * const boot_msg = #include <linux/interrupt.h> #include <linux/pci.h> #include <linux/netdevice.h> +#include <linux/etherdevice.h> #include <linux/fddidevice.h> #include <linux/skbuff.h> #include <linux/bitops.h> @@ -433,7 +434,7 @@ static int skfp_driver_init(struct net_device *dev) } read_address(smc, NULL); pr_debug("HW-Addr: %pMF\n", smc->hw.fddi_canon_addr.a); - memcpy(dev->dev_addr, smc->hw.fddi_canon_addr.a, ETH_ALEN); + eth_hw_addr_set(dev, smc->hw.fddi_canon_addr.a); smt_reset_defaults(smc, 0); @@ -500,7 +501,7 @@ static int skfp_open(struct net_device *dev) * address. */ read_address(smc, NULL); - memcpy(dev->dev_addr, smc->hw.fddi_canon_addr.a, ETH_ALEN); + eth_hw_addr_set(dev, smc->hw.fddi_canon_addr.a); init_smt(smc, NULL); smt_online(smc, 1); @@ -924,7 +925,7 @@ static int skfp_ctl_set_mac_address(struct net_device *dev, void *addr) unsigned long Flags; - memcpy(dev->dev_addr, p_sockaddr->sa_data, FDDI_K_ALEN); + dev_addr_set(dev, p_sockaddr->sa_data); spin_lock_irqsave(&bp->DriverLock, Flags); ResetAdapter(smc); spin_unlock_irqrestore(&bp->DriverLock, Flags); @@ -1012,7 +1013,7 @@ static int skfp_siocdevprivate(struct net_device *dev, struct ifreq *rq, void __ * is contained in a single physically contiguous buffer * in which the virtual address of the start of packet * (skb->data) can be converted to a physical address - * by using pci_map_single(). + * by using dma_map_single(). * * We have an internal queue for packets we can not send * immediately. Packets in this queue can be given to the |