[PATCH 2.6.9-rc4-bk3-netdev3 1/3] r8169: always clean Tx desc

[PATCH 2.6.9-rc4-bk3-netdev3 1/3] r8169: always clean Tx desc

[Francois Romieu]

rtl8169_unmap_tx_skb() can not assume that a Tx ring descriptor belongs
to the host as it can be issued during rtl8169_tx_clear() as a part of
a recovery process (during Tx timeout for instance).

Simple fix: always clean the relevant descriptor entry.

Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jon Mason <jdmason@us.ibm.com>

diff -puN drivers/net/r8169.c~r8169-225 drivers/net/r8169.c
--- linux-2.6.9/drivers/net/r8169.c~r8169-225	2004-10-18 22:13:54.000000000 +0200
+++ linux-2.6.9-fr/drivers/net/r8169.c	2004-10-18 23:31:21.000000000 +0200
@@ -1679,6 +1679,7 @@ static void rtl8169_unmap_tx_skb(struct 
 	unsigned int len = tx_skb->len;
 
 	pci_unmap_single(pdev, le64_to_cpu(desc->addr), len, PCI_DMA_TODEVICE);
+	desc->opts1 = 0x00;
 	desc->opts2 = 0x00;
 	desc->addr = 0x00;
 	tx_skb->len = 0;

_

[PATCH 2.6.9-rc4-bk3-netdev3 2/3] r8169: unneeded synchronize_irq()

[Francois Romieu]

synchronize_irq() is not needed as it is already issued by free_irq().

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>

diff -puN drivers/net/r8169.c~r8169-230 drivers/net/r8169.c
--- linux-2.6.9/drivers/net/r8169.c~r8169-230	2004-10-18 23:37:30.000000000 +0200
+++ linux-2.6.9-fr/drivers/net/r8169.c	2004-10-18 23:37:58.000000000 +0200
@@ -2259,7 +2259,6 @@ rtl8169_close(struct net_device *dev)
 
 	spin_unlock_irq(&tp->lock);
 
-	synchronize_irq(dev->irq);
 	free_irq(dev->irq, dev);
 
 	netif_poll_disable(dev);

_

[PATCH 2.6.9-rc4-bk3-netdev3 3/3] r8169: netconsole support

[Francois Romieu]

netconsole support.

Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff -puN drivers/net/r8169.c~r8169-235 drivers/net/r8169.c
--- linux-2.6.9/drivers/net/r8169.c~r8169-235	2004-10-18 23:39:38.000000000 +0200
+++ linux-2.6.9-fr/drivers/net/r8169.c	2004-10-18 23:56:27.000000000 +0200
@@ -1088,6 +1088,23 @@ static inline void rtl8169_request_timer
 	add_timer(timer);
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/*
+ * Polling 'interrupt' - used by things like netconsole to send skbs
+ * without having to re-enable interrupts. It's not called while
+ * the interrupt routine is executing.
+ */
+static void rtl8169_netpoll(struct net_device *dev)
+{
+	struct rtl8169_private *tp = netdev_priv(dev);
+	struct pci_dev *pdev = tp->pci_dev;
+
+	disable_irq(pdev->irq);
+	rtl8169_interrupt(pdev->irq, dev, NULL);
+	enable_irq(pdev->irq);
+}
+#endif
+
 static void rtl8169_release_board(struct pci_dev *pdev, struct net_device *dev,
 				  void *ioaddr)
 {
@@ -1314,6 +1331,10 @@ rtl8169_init_one(struct pci_dev *pdev, c
 	dev->vlan_rx_kill_vid = rtl8169_vlan_rx_kill_vid;
 #endif
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+	dev->poll_controller = rtl8169_netpoll;
+#endif
+
 	tp->intr_mask = 0xffff;
 	tp->pci_dev = pdev;
 	tp->mmio_addr = ioaddr;

_

Re: [PATCH 2.6.9-rc4-bk3-netdev3 1/3] r8169: always clean Tx desc

[Jeff Garzik]

applied 1-3