net PCI_ID fixes
PATCH 1/1 net PCI_ID fixes
Hi,
This patch renames some PCI_IDS in net drivers to use namespace from pci_ids.h.
Also the "__{dev,}initdata" variables in pcnet32.c put together. It seems that the "section type conflict" in pcnet32.c some -ac kernels ago was caused by __initdata variables not declared together (some public / static variables between them).
[ However I have no idea why separated __initdata vars break sometimes -
a gcc error? ]
Andrzej
*************************************************************************
drivers/net/pcnet32.c +10 -20
@@ -45,6 +45,16 @@static unsigned int pcnet32_portlist[]__initdata = {0x300 ,0x320 ,0x340 ,0x360 ,0 }; +/* +* PCI device identifiers for "new style" Linux PCI Device Drivers +*/ +static struct pci_device_id pcnet32_pci_tbl[]__devinitdata = { + {PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_LANCE_HOME ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + {PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_LANCE ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + {PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_LANCE ,0x1014 ,0x2000 ,0 ,0 ,0 }, + {0 , } +}; +static int pcnet32_debug =1 ;static int tx_start =1 ;/* Mapping -- 0:20, 1:64, 2:128, 3:~220 (depends on chip vers) */
@@ -204,16 +214,6 @@#define PCNET32_TOTAL_SIZE 0x20 -/* some PCI ids */ -#ifndef PCI_DEVICE_ID_AMD_LANCE -#define PCI_VENDOR_ID_AMD 0x1022 -#define PCI_DEVICE_ID_AMD_LANCE 0x2000 -#endif -#ifndef PCI_DEVICE_ID_AMD_PCNETHOME -#define PCI_DEVICE_ID_AMD_PCNETHOME 0x2001 -#endif - -#define CRC_POLYNOMIAL_LE 0xedb88320UL/* Ethernet CRC, little endian */ /* The PCNET32 Rx and Tx ring descriptors. */
@@ -318,16 +318,6 @@int (*probe1) (unsigned long ,unsigned char ,int ,int ,struct pci_dev *); }; - -/* -* PCI device identifiers for "new style" Linux PCI Device Drivers -*/ -static struct pci_device_id pcnet32_pci_tbl[]__devinitdata = { - {PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_PCNETHOME ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, - {PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_LANCE ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, - {PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_LANCE ,0x1014 ,0x2000 ,0 ,0 ,0 }, - {0 , } -};MODULE_DEVICE_TABLE (pci, pcnet32_pci_tbl);
Only in linux/drivers/net: pcnet32.c.orig
drivers/net/tlan.c +8 -8
@@ -241,21 +241,21 @@ };static struct pci_device_id tlan_pci_tbl[]__devinitdata = { - {PCI_VENDOR_ID_COMPAQ ,PCI_DEVICE_ID_NETELLIGENT_10 , + {PCI_VENDOR_ID_COMPAQ ,PCI_DEVICE_ID_COMPAQ_NETEL10 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, - {PCI_VENDOR_ID_COMPAQ ,PCI_DEVICE_ID_NETELLIGENT_10_100 , + {PCI_VENDOR_ID_COMPAQ ,PCI_DEVICE_ID_COMPAQ_NETEL100 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,1 }, - {PCI_VENDOR_ID_COMPAQ ,PCI_DEVICE_ID_NETFLEX_3P_INTEGRATED , + {PCI_VENDOR_ID_COMPAQ ,PCI_DEVICE_ID_COMPAQ_NETFLEX3I ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,2 }, - {PCI_VENDOR_ID_COMPAQ ,PCI_DEVICE_ID_NETFLEX_3P , + {PCI_VENDOR_ID_COMPAQ ,PCI_DEVICE_ID_COMPAQ_THUNDER ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,3 }, - {PCI_VENDOR_ID_COMPAQ ,PCI_DEVICE_ID_NETFLEX_3P_BNC , + {PCI_VENDOR_ID_COMPAQ ,PCI_DEVICE_ID_COMPAQ_NETFLEX3B ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,4 }, - {PCI_VENDOR_ID_COMPAQ ,PCI_DEVICE_ID_NETELLIGENT_10_100_PROLIANT , + {PCI_VENDOR_ID_COMPAQ ,PCI_DEVICE_ID_COMPAQ_NETEL100PI ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,5 }, - {PCI_VENDOR_ID_COMPAQ ,PCI_DEVICE_ID_NETELLIGENT_10_100_DUAL , + {PCI_VENDOR_ID_COMPAQ ,PCI_DEVICE_ID_COMPAQ_NETEL100D ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,6 }, - {PCI_VENDOR_ID_COMPAQ ,PCI_DEVICE_ID_DESKPRO_4000_5233MMX , + {PCI_VENDOR_ID_COMPAQ ,PCI_DEVICE_ID_COMPAQ_NETEL100I ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,7 }, {PCI_VENDOR_ID_OLICOM ,PCI_DEVICE_ID_OLICOM_OC2183 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,8 },
drivers/net/tlan.h +0 -8
@@ -61,14 +61,6 @@* ****************************************************************/ -#define PCI_DEVICE_ID_NETELLIGENT_10 0xAE34 -#define PCI_DEVICE_ID_NETELLIGENT_10_100 0xAE32 -#define PCI_DEVICE_ID_NETFLEX_3P_INTEGRATED 0xAE35 -#define PCI_DEVICE_ID_NETFLEX_3P 0xF130 -#define PCI_DEVICE_ID_NETFLEX_3P_BNC 0xF150 -#define PCI_DEVICE_ID_NETELLIGENT_10_100_PROLIANT 0xAE43 -#define PCI_DEVICE_ID_NETELLIGENT_10_100_DUAL 0xAE40 -#define PCI_DEVICE_ID_DESKPRO_4000_5233MMX 0xB011#define PCI_DEVICE_ID_NETELLIGENT_10_T2 0xB012#define PCI_DEVICE_ID_NETELLIGENT_10_100_WS_5100 0xB030#ifndef PCI_DEVICE_ID_OLICOM_OC2183
Signature · 4 lines
======================================================================= Andrzej M. Krzysztofowicz [email protected] phone (48)(58) 347 14 61 Faculty of Applied Phys. & Math., Technical University of Gdansk