[patch linux-2.6.12-rc3-mm3 1/7] r8169: de-obfuscate supported PCI ID

[patch linux-2.6.12-rc3-mm3 1/7] r8169: de-obfuscate supported PCI ID

[Francois Romieu]

De-obfuscate supported PCI ID

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

diff -puN drivers/net/r8169.c~r8169-440 drivers/net/r8169.c
--- a/drivers/net/r8169.c~r8169-440	2005-05-06 00:37:16.695925125 +0200
+++ b/drivers/net/r8169.c	2005-05-06 00:38:40.051448306 +0200
@@ -174,9 +174,9 @@ const static struct {
 #undef _R
 
 static struct pci_device_id rtl8169_pci_tbl[] = {
-	{0x10ec, 0x8169, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-	{0x1186, 0x4300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-	{0x16ec, 0x0116, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+	{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK,	0x8169), },
+	{ PCI_DEVICE(PCI_VENDOR_ID_DLINK,	0x4300), },
+	{ PCI_DEVICE(0x16ec,			0x0116), },
 	{0,},
 };
 

_

[patch linux-2.6.12-rc3-mm3 7/7] r8169: cleanup (function args)

[Francois Romieu]

minor cleanup

- more consistent function arguments;
- rtl8169_rx_interrupt()
  o the error condition should be rare;
  o goto removal.

Signed-off-by: Richard Dawe <rich@phekda.gotadsl.co.uk>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>

diff -puN drivers/net/r8169.c~r8169-580 drivers/net/r8169.c
--- a/drivers/net/r8169.c~r8169-580	2005-05-06 00:40:32.031341377 +0200
+++ b/drivers/net/r8169.c	2005-05-06 00:40:32.059336850 +0200
@@ -457,10 +457,10 @@ static void rtl8169_hw_start(struct net_
 static int rtl8169_close(struct net_device *dev);
 static void rtl8169_set_rx_mode(struct net_device *dev);
 static void rtl8169_tx_timeout(struct net_device *dev);
-static struct net_device_stats *rtl8169_get_stats(struct net_device *netdev);
+static struct net_device_stats *rtl8169_get_stats(struct net_device *dev);
 static int rtl8169_rx_interrupt(struct net_device *, struct rtl8169_private *,
 				void __iomem *);
-static int rtl8169_change_mtu(struct net_device *netdev, int new_mtu);
+static int rtl8169_change_mtu(struct net_device *dev, int new_mtu);
 static void rtl8169_down(struct net_device *dev);
 
 #ifdef CONFIG_R8169_NAPI
@@ -2360,7 +2360,7 @@ rtl8169_rx_interrupt(struct net_device *
 	rx_left = NUM_RX_DESC + tp->dirty_rx - cur_rx;
 	rx_left = rtl8169_rx_quota(rx_left, (u32) dev->quota);
 
-	while (rx_left > 0) {
+	for (; rx_left > 0; rx_left--, cur_rx++) {
 		unsigned int entry = cur_rx % NUM_RX_DESC;
 		struct RxDesc *desc = tp->RxDescArray + entry;
 		u32 status;
@@ -2370,7 +2370,7 @@ rtl8169_rx_interrupt(struct net_device *
 
 		if (status & DescOwn)
 			break;
-		if (status & RxRES) {
+		if (unlikely(status & RxRES)) {
 			if (netif_msg_rx_err(tp)) {
 				printk(KERN_INFO
 				       "%s: Rx ERROR. status = %08x\n",
@@ -2397,7 +2397,7 @@ rtl8169_rx_interrupt(struct net_device *
 				tp->stats.rx_dropped++;
 				tp->stats.rx_length_errors++;
 				rtl8169_mark_to_asic(desc, tp->rx_buf_sz);
-				goto move_on;
+				continue;
 			}
 
 			rtl8169_rx_csum(skb, desc);
@@ -2426,9 +2426,6 @@ rtl8169_rx_interrupt(struct net_device *
 			tp->stats.rx_bytes += pkt_size;
 			tp->stats.rx_packets++;
 		}
-move_on:		
-		cur_rx++; 
-		rx_left--;
 	}
 
 	count = cur_rx - tp->cur_rx;

_

Re: [patch linux-2.6.12-rc3-mm3 1/7] r8169: de-obfuscate supported PCI ID

[Jon Mason]

I only received patches 1,3, and 7.

Re: [patch linux-2.6.12-rc3-mm3 1/7] r8169: de-obfuscate supported PCI ID

[Francois Romieu]

Jon Mason <jdmason@us.ibm.com> :
> I only received patches 1,3, and 7.

If the DSNs don't lie, the messages should be somewhere in the pipe
behind oss.sgi.com.

Alternate location:
- http://www.fr.zoreil.com/linux/kernel/2.6.x/2.6.12-rc3-mm3

More alternate location:
- rsync://www.fr.zoreil.com/linux-2.6.git/
  commit 778e3479a76e03b319fc18a6416cb9b766029cc3

--
Ueimor

Re: [patch linux-2.6.12-rc3-mm3 1/7] r8169: de-obfuscate supported PCI ID

[Jeff Garzik]

All seven look OK, but it failed on the first patch:

[jgarzik@pretzel netdev-2.6]$ dotest /g/tmp/mbox

Applying 'r8169: de-obfuscate supported PCI ID'

patching file drivers/net/r8169.c
Hunk #1 FAILED at 174.
1 out of 1 hunk FAILED -- saving rejects to file drivers/net/r8169.c.rej

Re: [patch linux-2.6.12-rc3-mm3 1/7] r8169: de-obfuscate supported PCI ID

[Francois Romieu]

Jeff Garzik <jgarzik@pobox.com> :
> All seven look OK, but it failed on the first patch:
> 
> [jgarzik@pretzel netdev-2.6]$ dotest /g/tmp/mbox
> 
> Applying 'r8169: de-obfuscate supported PCI ID'
> 
> patching file drivers/net/r8169.c
> Hunk #1 FAILED at 174.
> 1 out of 1 hunk FAILED -- saving rejects to file drivers/net/r8169.c.rej

Yes. In the meantime, -mm was applied:
[patch 2.6.12-rc2-mm3 1/1] r8169: new PCI id

Should I send a serie of patches against
126fa4b9ca5d9d7cb7d46f779ad3bd3631ca387c to update it to r8169-mm-latest ?

--
Ueimor