| From romieu@fr.zoreil.com Tue May 13 11:03:16 2008 |
| From: Roel Kluin <12o3l@tiscali.nl> |
| Date: Sun, 11 May 2008 10:59:44 +0200 |
| Subject: r8169: fix past rtl_chip_info array size for unknown chipsets |
| To: stable@kernel.org |
| Message-ID: <20080511085944.GA10648@electric-eye.fr.zoreil.com> |
| Content-Disposition: inline |
| |
| From: Roel Kluin <12o3l@tiscali.nl> |
| |
| commit cee60c377de6d9d10f0a2876794149bd79a15020 upstream. |
| |
| 'i' is unsigned. |
| |
| Signed-off-by: Roel Kluin <12o3l@tiscali.nl> |
| Acked-by: Francois Romieu <romieu@fr.zoreil.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/net/r8169.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/net/r8169.c |
| +++ b/drivers/net/r8169.c |
| @@ -1705,18 +1705,18 @@ rtl8169_init_one(struct pci_dev *pdev, c |
| |
| 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; |
| |
