Re: r8169: read MAC address from EEPROM on init

Re: r8169: read MAC address from EEPROM on init

[David Miller]

Applied to net-next-2.6

Re: r8169: read MAC address from EEPROM on init

[Francois Romieu]

David Miller <davem@davemloft.net> :
> 
> Applied to net-next-2.6

rtl8169_init_one
-> rtl_init_mac_address
   -> rtl_rar_set
      -> spin_lock_irq(&tp->lock);
[...]
-> spin_lock_init(&tp->lock);

I am used to respin my patch kit anyway.

-- 
Ueimor

Re: r8169: read MAC address from EEPROM on init

[David Miller]

From: Francois Romieu <romieu@fr.zoreil.com>
Date: Thu, 9 Oct 2008 22:16:07 +0200

> David Miller <davem@davemloft.net> :
> > 
> > Applied to net-next-2.6
> 
> rtl8169_init_one
> -> rtl_init_mac_address
>    -> rtl_rar_set
>       -> spin_lock_irq(&tp->lock);
> [...]
> -> spin_lock_init(&tp->lock);

Grrr...

> I am used to respin my patch kit anyway.

Please send it to me, I'd _REALLY_ appreciate this as the
only patches in the queue were posted by other people and
you're only mention or r8169 changes is you posting a pointer
to some GIT tree or patch set without any "dave/jeff please
pull this".

I'd rather you send me fixes as soon as you have them rather
than have them get clogged up in your tree for weeks or longer.
That's how mistakes like this happen.

If I don't have any fixes from the official person (you) then
I'm going to apply fixes that look OK from people who do actually
post them individually to the list for review.

:-)

[PATCH] r8169: fix early spinlock use

[Francois Romieu]

rtl8169_init_one
-> rtl_init_mac_address
   -> rtl_rar_set
      -> spin_lock_irq(&tp->lock);
[...]
-> spin_lock_init(&tp->lock);

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
---
 drivers/net/r8169.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 108aaff..59fbc64 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1952,7 +1952,8 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 		dev->do_ioctl = rtl8169_ioctl;
 	}
 
-	/* Read MAC address from EEPROM */
+	spin_lock_init(&tp->lock);
+
 	rtl_init_mac_address(tp, ioaddr);
 
 	/* Get MAC address */
@@ -1995,8 +1996,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	tp->timer.data = (unsigned long) dev;
 	tp->timer.function = rtl8169_phy_timer;
 
-	spin_lock_init(&tp->lock);
-
 	rc = register_netdev(dev);
 	if (rc < 0)
 		goto err_out_msi_5;
-- 
1.5.3.3

Re: [PATCH] r8169: fix early spinlock use

[David Miller]

From: Francois Romieu <romieu@fr.zoreil.com>
Date: Thu, 9 Oct 2008 23:35:13 +0200

> rtl8169_init_one
> -> rtl_init_mac_address
>    -> rtl_rar_set
>       -> spin_lock_irq(&tp->lock);
> [...]
> -> spin_lock_init(&tp->lock);
> 
> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>

Applied thanks!