]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ne2k-pci: Do not register device until initialized.
authorLubomir Rintel <lkundrak@v3.sk>
Sat, 2 May 2009 20:52:13 +0000 (13:52 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 18 May 2009 23:34:47 +0000 (16:34 -0700)
commit 379b026ecc20c4657d37e40ead789f7f28f1a1c1 upstream.

Doing it in reverse order causes uevent to be sent before
we have a MAC address, which confuses udev.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Acked-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/net/ne2k-pci.c

index f090d3b9ec94791fd69a7a89067dfa61caa927d9..453d6bb6444b13b343e194fb9da006ef0fc97708 100644 (file)
@@ -373,18 +373,17 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev,
        dev->ethtool_ops = &ne2k_pci_ethtool_ops;
        NS8390_init(dev, 0);
 
+       memcpy(dev->dev_addr, SA_prom, 6);
+       memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
+
        i = register_netdev(dev);
        if (i)
                goto err_out_free_netdev;
 
-       for(i = 0; i < 6; i++)
-               dev->dev_addr[i] = SA_prom[i];
        printk("%s: %s found at %#lx, IRQ %d, %pM.\n",
               dev->name, pci_clone_list[chip_idx].name, ioaddr, dev->irq,
               dev->dev_addr);
 
-       memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
-
        return 0;
 
 err_out_free_netdev: