[patch 2.6.11-rc3 5/5] r8169: synchronization and balancing when the device is closed

[Francois Romieu <romieu@xxxxxxxxxxxxx>]

rtl8169_close synchronization and balancing

- use synchronize_kernel() to sync with the xmit thread (kindly suggested
  by davem);
- balance the netif_poll_disable issued in rtl8169_down.

Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>

diff -puN drivers/net/r8169.c~r8169-390 drivers/net/r8169.c
--- a/drivers/net/r8169.c~r8169-390     2005-02-12 00:06:40.381648524 +0100
+++ b/drivers/net/r8169.c       2005-02-12 00:06:48.015420988 +0100
@@ -2382,8 +2382,7 @@ static void rtl8169_down(struct net_devi
        netif_poll_disable(dev);
 
        /* Give a racing hard_start_xmit a few cycles to complete. */
-       set_current_state(TASK_UNINTERRUPTIBLE);
-       schedule_timeout(1);
+       synchronize_kernel();
 
        rtl8169_tx_clear(tp);
 
@@ -2399,6 +2398,8 @@ static int rtl8169_close(struct net_devi
 
        free_irq(dev->irq, dev);
 
+       netif_poll_enable(dev);
+
        pci_free_consistent(pdev, R8169_RX_RING_BYTES, tp->RxDescArray,
                            tp->RxPhyAddr);
        pci_free_consistent(pdev, R8169_TX_RING_BYTES, tp->TxDescArray,

_