diff options
Diffstat (limited to 'drivers/net/natsemi.c')
-rw-r--r-- | drivers/net/natsemi.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index 2fd39630b1e5..1074231f0a0d 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
@@ -203,7 +203,7 @@ skbuff at an offset of "+2", 16-byte aligning the IP header. | |||
203 | IIId. Synchronization | 203 | IIId. Synchronization |
204 | 204 | ||
205 | Most operations are synchronized on the np->lock irq spinlock, except the | 205 | Most operations are synchronized on the np->lock irq spinlock, except the |
206 | recieve and transmit paths which are synchronised using a combination of | 206 | receive and transmit paths which are synchronised using a combination of |
207 | hardware descriptor ownership, disabling interrupts and NAPI poll scheduling. | 207 | hardware descriptor ownership, disabling interrupts and NAPI poll scheduling. |
208 | 208 | ||
209 | IVb. References | 209 | IVb. References |
@@ -726,7 +726,7 @@ static void move_int_phy(struct net_device *dev, int addr) | |||
726 | * There are two addresses we must avoid: | 726 | * There are two addresses we must avoid: |
727 | * - the address on the external phy that is used for transmission. | 727 | * - the address on the external phy that is used for transmission. |
728 | * - the address that we want to access. User space can access phys | 728 | * - the address that we want to access. User space can access phys |
729 | * on the mii bus with SIOCGMIIREG/SIOCSMIIREG, independant from the | 729 | * on the mii bus with SIOCGMIIREG/SIOCSMIIREG, independent from the |
730 | * phy that is used for transmission. | 730 | * phy that is used for transmission. |
731 | */ | 731 | */ |
732 | 732 | ||
@@ -860,6 +860,9 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev, | |||
860 | prev_eedata = eedata; | 860 | prev_eedata = eedata; |
861 | } | 861 | } |
862 | 862 | ||
863 | /* Store MAC Address in perm_addr */ | ||
864 | memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN); | ||
865 | |||
863 | dev->base_addr = (unsigned long __force) ioaddr; | 866 | dev->base_addr = (unsigned long __force) ioaddr; |
864 | dev->irq = irq; | 867 | dev->irq = irq; |
865 | 868 | ||
@@ -1982,7 +1985,7 @@ static void init_ring(struct net_device *dev) | |||
1982 | 1985 | ||
1983 | np->rx_head_desc = &np->rx_ring[0]; | 1986 | np->rx_head_desc = &np->rx_ring[0]; |
1984 | 1987 | ||
1985 | /* Please be carefull before changing this loop - at least gcc-2.95.1 | 1988 | /* Please be careful before changing this loop - at least gcc-2.95.1 |
1986 | * miscompiles it otherwise. | 1989 | * miscompiles it otherwise. |
1987 | */ | 1990 | */ |
1988 | /* Initialize all Rx descriptors. */ | 1991 | /* Initialize all Rx descriptors. */ |