From patchwork Sat May 2 16:28:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 26810 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id BAF27B7069 for ; Sun, 3 May 2009 02:53:59 +1000 (EST) Received: by ozlabs.org (Postfix) id AE9AEDDF74; Sun, 3 May 2009 02:53:59 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 51D9BDDF71 for ; Sun, 3 May 2009 02:53:59 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756506AbZEBQxw (ORCPT ); Sat, 2 May 2009 12:53:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755430AbZEBQxv (ORCPT ); Sat, 2 May 2009 12:53:51 -0400 Received: from norkia.v3.sk ([92.240.234.41]:39108 "EHLO norkia.v3.sk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754405AbZEBQxu (ORCPT ); Sat, 2 May 2009 12:53:50 -0400 X-Greylist: delayed 1494 seconds by postgrey-1.27 at vger.kernel.org; Sat, 02 May 2009 12:53:50 EDT Received: from [172.31.2.66] (ip-89-102-207-186.karneval.cz [89.102.207.186]) (using SSLv3 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: lkundrak@v3.sk) by norkia.v3.sk (Postfix) with ESMTP id 845D6801D5; Sat, 2 May 2009 18:28:56 +0200 (CEST) Subject: [PATCH] Do not register ne2k-pci device until initialized From: Lubomir Rintel To: netdev@vger.kernel.org, Andrew Morton , Linux Kernel Mailing List , stable@kernel.org Date: Sat, 02 May 2009 18:28:54 +0200 Message-Id: <1241281735.2641.7.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.26.1 (2.26.1-2.fc11) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Doing it in reverse order causes uevent to be sent before we have a MAC address, which confuses udev. Signed-off-by: Lubomir Rintel Acked-by: Jeff Garzik --- drivers/net/ne2k-pci.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c index eb66f65..7d83896 100644 --- a/drivers/net/ne2k-pci.c +++ b/drivers/net/ne2k-pci.c @@ -374,18 +374,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: