Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/ro…

…mieu/netdev-2.6 into upstream

Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/ro…
…mieu/netdev-2.6 into upstream
Jeff Garzik · Jeff Garzik
2 parents 090bf62199 21e197f231
Showing 1 changed file Side-by-side Diff
drivers/net/r8169.c
@@ -1617,6 +1617,7 @@
 	SET_NETDEV_DEV(dev, &pdev->dev);
 	tp = netdev_priv(dev);
 	tp->dev = dev;
+	tp->pci_dev = pdev;
 	tp->msg_enable = netif_msg_init(debug.msg_enable, R8169_MSG_DEFAULT);
  
 	/* enable device (incl. PCI PM wakeup and hotplug setup) */
  
  
@@ -1705,18 +1706,18 @@
  
 	rtl8169_print_mac_version(tp);
  
-	for (i = ARRAY_SIZE(rtl_chip_info) - 1; i >= 0; i--) {
+	for (i = 0; i < ARRAY_SIZE(rtl_chip_info); i++) {
 		if (tp->mac_version == rtl_chip_info[i].mac_version)
 			break;
 	}
-	if (i < 0) {
+	if (i == ARRAY_SIZE(rtl_chip_info)) {
 		/* Unknown chip: assume array element #0, original RTL-8169 */
 		if (netif_msg_probe(tp)) {
 			dev_printk(KERN_DEBUG, &pdev->dev,
 				"unknown chip version, assuming %s\n",
 				rtl_chip_info[0].name);
 		}
-		i++;
+		i = 0;
 	}
 	tp->chipset = i;
  
@@ -1777,7 +1778,6 @@
 #endif
  
 	tp->intr_mask = 0xffff;
-	tp->pci_dev = pdev;
 	tp->mmio_addr = ioaddr;
 	tp->align = cfg->align;
 	tp->hw_start = cfg->hw_start;
...	...	@@ -1617,6 +1617,7 @@
1617	1617	SET_NETDEV_DEV(dev, &pdev->dev);
1618	1618	tp = netdev_priv(dev);
1619	1619	tp->dev = dev;
	1620	+ tp->pci_dev = pdev;
1620	1621	tp->msg_enable = netif_msg_init(debug.msg_enable, R8169_MSG_DEFAULT);
1621	1622
1622	1623	/* enable device (incl. PCI PM wakeup and hotplug setup) */
1623	1624
1624	1625
...	...	@@ -1705,18 +1706,18 @@
1705	1706
1706	1707	rtl8169_print_mac_version(tp);
1707	1708
1708		- for (i = ARRAY_SIZE(rtl_chip_info) - 1; i >= 0; i--) {
	1709	+ for (i = 0; i < ARRAY_SIZE(rtl_chip_info); i++) {
1709	1710	if (tp->mac_version == rtl_chip_info[i].mac_version)
1710	1711	break;
1711	1712	}
1712		- if (i < 0) {
	1713	+ if (i == ARRAY_SIZE(rtl_chip_info)) {
1713	1714	/* Unknown chip: assume array element #0, original RTL-8169 */
1714	1715	if (netif_msg_probe(tp)) {
1715	1716	dev_printk(KERN_DEBUG, &pdev->dev,
1716	1717	"unknown chip version, assuming %s\n",
1717	1718	rtl_chip_info[0].name);
1718	1719	}
1719		- i++;
	1720	+ i = 0;
1720	1721	}
1721	1722	tp->chipset = i;
1722	1723
...	...	@@ -1777,7 +1778,6 @@
1777	1778	#endif
1778	1779
1779	1780	tp->intr_mask = 0xffff;
1780		- tp->pci_dev = pdev;
1781	1781	tp->mmio_addr = ioaddr;
1782	1782	tp->align = cfg->align;
1783	1783	tp->hw_start = cfg->hw_start;