]> git.neil.brown.name Git - history.git/commitdiff
Import 2.0.34pre10 2.0.34pre10
authorAlan Cox <alan@lxorguk.ukuu.org.uk>
Fri, 23 Nov 2007 20:11:43 +0000 (15:11 -0500)
committerAlan Cox <alan@lxorguk.ukuu.org.uk>
Fri, 23 Nov 2007 20:11:43 +0000 (15:11 -0500)
drivers/pci/pci.c
include/linux/pci.h
net/ipv4/ip_fragment.c
net/ipv4/proc.c

index f7dd89311736ce65bcf55d3cc38425e1eff376f2..0574de0ced9c29b1b9c1c11c9a151d94aad39bd6 100644 (file)
@@ -45,10 +45,15 @@ struct pci_dev *pci_devices = 0;
  */
 struct pci_dev_info dev_info[] = {
        DEVICE( COMPAQ,         COMPAQ_1280,    "QVision 1280/p"),
-       DEVICE( COMPAQ,         COMPAQ_NETELL100,"Netelligent 10/100"),
-       DEVICE( COMPAQ,         COMPAQ_NETELL10,"Netelligent 10"),
-       DEVICE( COMPAQ,         COMPAQ_NETFLEX3,"NetFlex 3"),
+       DEVICE( COMPAQ,         COMPAQ_SMART2P, "Smart-2/P RAID Controller"),
+       DEVICE( COMPAQ,         COMPAQ_NETEL100,"Netelligent 10/100"),
+       DEVICE( COMPAQ,         COMPAQ_NETEL10, "Netelligent 10"),
+       DEVICE( COMPAQ,         COMPAQ_NETFLEX3I,"NetFlex 3"),
+       DEVICE( COMPAQ,         COMPAQ_NETEL100D,"Netelligent 10/100 Dual"),
+       DEVICE( COMPAQ,         COMPAQ_NETEL100PI,"Netelligent 10/100 ProLiant"),
+       DEVICE( COMPAQ,         COMPAQ_NETEL100I,"Netelligent 10/100 Integrated"),
        DEVICE( COMPAQ,         COMPAQ_THUNDER, "ThunderLAN"),
+       DEVICE( COMPAQ,         COMPAQ_NETFLEX3B,"NetFlex 3 BNC"),
        DEVICE( NCR,            NCR_53C810,     "53c810"),
        DEVICE( NCR,            NCR_53C820,     "53c820"),
        DEVICE( NCR,            NCR_53C825,     "53c825"),
@@ -58,18 +63,34 @@ struct pci_dev_info dev_info[] = {
        DEVICE( NCR,            NCR_53C895,     "53c895"),
        DEVICE( NCR,            NCR_53C885,     "53c885"),
        DEVICE( NCR,            NCR_53C875,     "53c875"),
+       DEVICE( NCR,            NCR_53C875J,    "53c875J"),
        DEVICE( ATI,            ATI_68800,      "68800AX"),
        DEVICE( ATI,            ATI_215CT222,   "215CT222"),
        DEVICE( ATI,            ATI_210888CX,   "210888CX"),
+       DEVICE( ATI,            ATI_215GB,      "Mach64 GB"),
+       DEVICE( ATI,            ATI_215GD,      "Mach64 GD (Rage Pro)"),
+       DEVICE( ATI,            ATI_215GI,      "Mach64 GI (Rage Pro)"),
+       DEVICE( ATI,            ATI_215GP,      "Mach64 GP (Rage Pro)"),
+       DEVICE( ATI,            ATI_215GQ,      "Mach64 GQ (Rage Pro)"),
        DEVICE( ATI,            ATI_215GT,      "Mach64 GT (Rage II)"),
+       DEVICE( ATI,            ATI_215GTB,     "Mach64 GT (Rage II)"),
        DEVICE( ATI,            ATI_210888GX,   "210888GX"),
+       DEVICE( ATI,            ATI_215LG,      "Mach64 LG (3D Rage LT)"),
+       DEVICE( ATI,            ATI_264LT,      "Mach64 LT"),
        DEVICE( ATI,            ATI_264VT,      "Mach64 VT"),
        DEVICE( VLSI,           VLSI_82C592,    "82C592-FC1"),
        DEVICE( VLSI,           VLSI_82C593,    "82C593-FC1"),
        DEVICE( VLSI,           VLSI_82C594,    "82C594-AFC2"),
        DEVICE( VLSI,           VLSI_82C597,    "82C597-AFC2"),
-       DEVICE( VLSI,           VLSI_VAS96011,  "VAS96011 PowerPC"),
+       DEVICE( VLSI,           VLSI_82C541,    "82C541 Lynx"),
+       DEVICE( VLSI,           VLSI_82C543,    "82C543 Lynx ISA"),
+       DEVICE( VLSI,           VLSI_82C532,    "82C532"),
+       DEVICE( VLSI,           VLSI_82C534,    "82C534"),
+       DEVICE( VLSI,           VLSI_82C535,    "82C535"),
+       DEVICE( VLSI,           VLSI_82C147,    "82C147"),
+       DEVICE( VLSI,           VLSI_VAS96011,  "VAS96011 (Golden Gate II)"),
        DEVICE( ADL,            ADL_2301,       "2301"),
+       DEVICE( NS,             NS_87415,       "87415"),
        DEVICE( NS,             NS_87410,       "87410"),
        DEVICE( TSENG,          TSENG_W32P_2,   "ET4000W32P"),
        DEVICE( TSENG,          TSENG_W32P_b,   "ET4000W32P rev B"),
@@ -80,12 +101,14 @@ struct pci_dev_info dev_info[] = {
        DEVICE( WEITEK,         WEITEK_P9100,   "P9100"),
        BRIDGE( DEC,            DEC_BRD,        "DC21050",              0x00),
        DEVICE( DEC,            DEC_TULIP,      "DC21040"),
-       DEVICE( DEC,            DEC_TGA,        "DC21030"),
+       DEVICE( DEC,            DEC_TGA,        "DC21030 (TGA)"),
        DEVICE( DEC,            DEC_TULIP_FAST, "DC21140"),
+       DEVICE( DEC,            DEC_TGA2,       "TGA2"),
        DEVICE( DEC,            DEC_FDDI,       "DEFPA"),
        DEVICE( DEC,            DEC_TULIP_PLUS, "DC21041"),
        DEVICE( DEC,            DEC_21142,      "DC21142"),
        DEVICE( DEC,            DEC_21052,      "DC21052"),
+       DEVICE( DEC,            DEC_21150,      "DC21150"),
        DEVICE( DEC,            DEC_21152,      "DC21152"),
        DEVICE( CIRRUS,         CIRRUS_7548,    "GD 7548"),
        DEVICE( CIRRUS,         CIRRUS_5430,    "GD 5430"),
@@ -102,29 +125,41 @@ struct pci_dev_info dev_info[] = {
        DEVICE( CIRRUS,         CIRRUS_7543,    "CL 7543"),
        DEVICE( CIRRUS,         CIRRUS_7541,    "CL 7541"),
        DEVICE( IBM,            IBM_FIRE_CORAL, "Fire Coral"),
+       DEVICE( IBM,            IBM_TR,         "Token Ring"),
        DEVICE( IBM,            IBM_82G2675,    "82G2675"),
+       DEVICE( IBM,            IBM_MCA,        "MicroChannel"),
        DEVICE( IBM,            IBM_82351,      "82351"),
+       DEVICE( IBM,            IBM_SERVERAID,  "ServeRAID"),
+       DEVICE( IBM,            IBM_TR_WAKE,    "Wake On LAN Token Ring"),
+       DEVICE( IBM,            IBM_3780IDSP,   "MWave DSP"),
        DEVICE( WD,             WD_7197,        "WD 7197"),
        DEVICE( AMD,            AMD_LANCE,      "79C970"),
        DEVICE( AMD,            AMD_SCSI,       "53C974"),
+       DEVICE( TRIDENT,        TRIDENT_9397,   "Cyber9397"),
        DEVICE( TRIDENT,        TRIDENT_9420,   "TG 9420"),
        DEVICE( TRIDENT,        TRIDENT_9440,   "TG 9440"),
-       DEVICE( TRIDENT,        TRIDENT_9660,   "TG 9660"),
+       DEVICE( TRIDENT,        TRIDENT_9660,   "TG 9660 / Cyber9385"),
+       DEVICE( TRIDENT,        TRIDENT_9750,   "Image 975"),
        DEVICE( AI,             AI_M1435,       "M1435"),
        DEVICE( MATROX,         MATROX_MGA_2,   "Atlas PX2085"),
        DEVICE( MATROX,         MATROX_MIL,     "Millennium"),
        DEVICE( MATROX,         MATROX_MYS,     "Mystique"),
        DEVICE( MATROX,         MATROX_MIL_2,   "Millennium II"),
+       DEVICE( MATROX,         MATROX_MIL_2_AGP,"Millennium II AGP"),
        DEVICE( MATROX,         MATROX_MGA_IMP, "MGA Impression"),
        DEVICE( CT,             CT_65545,       "65545"),
        DEVICE( CT,             CT_65548,       "65548"),
        DEVICE( CT,             CT_65550,       "65550"),
        DEVICE( CT,             CT_65554,       "65554"),
+       DEVICE( CT,             CT_65555,       "65555"),
        DEVICE( MIRO,           MIRO_36050,     "ZR36050"),
+       DEVICE( NEC,            NEC_PCX2,       "PowerVR PCX2"),
        DEVICE( FD,             FD_36C70,       "TMC-18C30"),
-       DEVICE( SI,             SI_6201,        "6201"),
+       DEVICE( SI,             SI_5591_AGP,    "5591/5592 AGP"),
        DEVICE( SI,             SI_6202,        "6202"),
        DEVICE( SI,             SI_503,         "85C503"),
+       DEVICE( SI,             SI_ACPI,        "ACPI"),
+       DEVICE( SI,             SI_5597_VGA,    "5597/5598 VGA"),
        DEVICE( SI,             SI_6205,        "6205"),
        DEVICE( SI,             SI_501,         "85C501"),
        DEVICE( SI,             SI_496,         "85C496"),
@@ -133,29 +168,42 @@ struct pci_dev_info dev_info[] = {
        DEVICE( SI,             SI_5511,                "85C5511"),
        DEVICE( SI,             SI_5513,                "85C5513"),
        DEVICE( SI,             SI_5571,        "5571"),
-       DEVICE( SI,             SI_7001,        "7001"),
+       DEVICE( SI,             SI_5591,        "5591/5592 Host"),
+       DEVICE( SI,             SI_5597,        "5597/5598 Host"),
+       DEVICE( SI,             SI_7001,        "7001 USB"),
        DEVICE( HP,             HP_J2585A,      "J2585A"),
        DEVICE( HP,             HP_J2585B,      "J2585B (Lassen)"),
        DEVICE( PCTECH,         PCTECH_RZ1000,  "RZ1000 (buggy)"),
        DEVICE( PCTECH,         PCTECH_RZ1001,  "RZ1001 (buggy?)"),
+       DEVICE( PCTECH,         PCTECH_SAMURAI_0,"Samurai 0"),
+       DEVICE( PCTECH,         PCTECH_SAMURAI_1,"Samurai 1"),
+       DEVICE( PCTECH,         PCTECH_SAMURAI_IDE,"Samurai IDE"),
        DEVICE( DPT,            DPT,            "SmartCache/Raid"),
        DEVICE( OPTI,           OPTI_92C178,    "92C178"),
-       DEVICE( OPTI,           OPTI_82C557,    "82C557"),
-       DEVICE( OPTI,           OPTI_82C558,    "82C558"),
+       DEVICE( OPTI,           OPTI_82C557,    "82C557 Viper-M"),
+       DEVICE( OPTI,           OPTI_82C558,    "82C558 Viper-M ISA+IDE"),
        DEVICE( OPTI,           OPTI_82C621,    "82C621"),
+       DEVICE( OPTI,           OPTI_82C700,    "82C700"),
+       DEVICE( OPTI,           OPTI_82C701,    "82C701 FireStar Plus"),
+       DEVICE( OPTI,           OPTI_82C814,    "82C814 Firebridge 1"),
        DEVICE( OPTI,           OPTI_82C822,    "82C822"),
+       DEVICE( OPTI,           OPTI_82C825,    "82C825 Firebridge 2"),
        DEVICE( SGS,            SGS_2000,       "STG 2000X"),
        DEVICE( SGS,            SGS_1764,       "STG 1764X"),
        DEVICE( BUSLOGIC,       BUSLOGIC_MULTIMASTER_NC, "MultiMaster NC"),
        DEVICE( BUSLOGIC,       BUSLOGIC_MULTIMASTER,    "MultiMaster"),
        DEVICE( BUSLOGIC,       BUSLOGIC_FLASHPOINT,     "FlashPoint"),
+       DEVICE( TI,             TI_TVP4010,     "TVP4010 Permedia"),
+       DEVICE( TI,             TI_TVP4020,     "TVP4020 Permedia 2"),
        DEVICE( TI,             TI_PCI1130,     "PCI1130"),
        DEVICE( TI,             TI_PCI1131,     "PCI1131"),
+       DEVICE( TI,             TI_PCI1250,     "PCI1250"),
        DEVICE( OAK,            OAK_OTI107,     "OTI107"),
        DEVICE( WINBOND2,       WINBOND2_89C940,"NE2000-PCI"),
        DEVICE( MOTOROLA,       MOTOROLA_MPC105,"MPC105 Eagle"),
        DEVICE( MOTOROLA,       MOTOROLA_MPC106,"MPC106 Grackle"),
        DEVICE( MOTOROLA,       MOTOROLA_RAVEN, "Raven"),
+       DEVICE( PROMISE,        PROMISE_20246,  "IDE UltraDMA/33"),
        DEVICE( PROMISE,        PROMISE_5300,   "DC5030"),
        DEVICE( N9,             N9_I128,        "Imagine 128"),
        DEVICE( N9,             N9_I128_2,      "Imagine 128v2"),
@@ -169,20 +217,36 @@ struct pci_dev_info dev_info[] = {
        DEVICE( UMC,            UMC_UM8886N,    "UM8886N"),
        DEVICE( UMC,            UMC_UM8891N,    "UM8891N"),
        DEVICE( X,              X_AGX016,       "ITT AGX016"),
+       DEVICE( PICOP,          PICOP_PT86C52X, "PT86C52x Vesuvius"),
+       DEVICE( PICOP,          PICOP_PT80C524, "PT80C524 Nile"),
        DEVICE( APPLE,          APPLE_BANDIT,   "Bandit"),
        DEVICE( APPLE,          APPLE_GC,       "Grand Central"),
        DEVICE( APPLE,          APPLE_HYDRA,    "Hydra"),
        DEVICE( NEXGEN,         NEXGEN_82C501,  "82C501"),
        DEVICE( QLOGIC,         QLOGIC_ISP1020, "ISP1020"),
        DEVICE( QLOGIC,         QLOGIC_ISP1022, "ISP1022"),
+       DEVICE( CYRIX,          CYRIX_5510,     "5510"),
+       DEVICE( CYRIX,          CYRIX_PCI_MASTER,"PCI Master"),
+       DEVICE( CYRIX,          CYRIX_5520,     "5520"),
+       DEVICE( CYRIX,          CYRIX_5530_LEGACY,"5530 Kahlua Legacy"),
+       DEVICE( CYRIX,          CYRIX_5530_SMI, "5530 Kahlua SMI"),
+       DEVICE( CYRIX,          CYRIX_5530_IDE, "5530 Kahlua IDE"),
+       DEVICE( CYRIX,          CYRIX_5530_AUDIO,"5530 Kahlua Audio"),
+       DEVICE( CYRIX,          CYRIX_5530_VIDEO,"5530 Kahlua Video"),
        DEVICE( LEADTEK,        LEADTEK_805,    "S3 805"),
        DEVICE( CONTAQ,         CONTAQ_82C599,  "82C599"),
+       DEVICE( CONTAQ,         CONTAQ_82C693,  "82C693"),
        DEVICE( OLICOM,         OLICOM_OC3136,  "OC-3136/3137"),
        DEVICE( OLICOM,         OLICOM_OC2315,  "OC-2315"),
        DEVICE( OLICOM,         OLICOM_OC2325,  "OC-2325"),
        DEVICE( OLICOM,         OLICOM_OC2183,  "OC-2183/2185"),
        DEVICE( OLICOM,         OLICOM_OC2326,  "OC-2326"),
        DEVICE( OLICOM,         OLICOM_OC6151,  "OC-6151/6152"),
+       DEVICE( SUN,            SUN_EBUS,       "EBUS"),
+       DEVICE( SUN,            SUN_HAPPYMEAL,  "Happy Meal Ethernet"),
+       DEVICE( SUN,            SUN_SIMBA,      "Advanced PCI Bridge"),
+       DEVICE( SUN,            SUN_PBM,        "PCI Bus Module"),
+       DEVICE( SUN,            SUN_SABRE,      "Ultra IIi PCI"),
        DEVICE( CMD,            CMD_640,        "640 (buggy)"),
        DEVICE( CMD,            CMD_643,        "643"),
        DEVICE( CMD,            CMD_646,        "646"),
@@ -190,12 +254,17 @@ struct pci_dev_info dev_info[] = {
        DEVICE( VISION,         VISION_QD8500,  "QD-8500"),
        DEVICE( VISION,         VISION_QD8580,  "QD-8580"),
        DEVICE( BROOKTREE,      BROOKTREE_848,  "Bt848"),
+       DEVICE( BROOKTREE,      BROOKTREE_849A, "Bt849"),
+       DEVICE( BROOKTREE,      BROOKTREE_8474, "Bt8474"),
        DEVICE( SIERRA,         SIERRA_STB,     "STB Horizon 64"),
        DEVICE( ACC,            ACC_2056,       "2056"),
        DEVICE( WINBOND,        WINBOND_83769,  "W83769F"),
        DEVICE( WINBOND,        WINBOND_82C105, "SL82C105"),
        DEVICE( WINBOND,        WINBOND_83C553, "W83C553"),
        DEVICE( DATABOOK,       DATABOOK_87144, "DB87144"),
+       DEVICE( PLX,            PLX_9080,       "PCI9080 I2O"),
+       DEVICE( MADGE,          MADGE_MK2,      "Smart 16/4 BM Mk2 Ringnode"),
+       DEVICE( 3COM,           3COM_3C339,     "3C339 TokenRing"),
        DEVICE( 3COM,           3COM_3C590,     "3C590 10bT"),
        DEVICE( 3COM,           3COM_3C595TX,   "3C595 100bTX"),
        DEVICE( 3COM,           3COM_3C595T4,   "3C595 100bT4"),
@@ -203,6 +272,9 @@ struct pci_dev_info dev_info[] = {
        DEVICE( 3COM,           3COM_3C900TPO,  "3C900 10bTPO"),
        DEVICE( 3COM,           3COM_3C900COMBO,"3C900 10b Combo"),
        DEVICE( 3COM,           3COM_3C905TX,   "3C905 100bTX"),
+       DEVICE( 3COM,           3COM_3C905T4,   "3C905 100bT4"),
+       DEVICE( 3COM,           3COM_3C905B_TX, "3C905B 100bTX"),
+       DEVICE( SMC,            SMC_EPIC100,    "9432 TX"),
        DEVICE( AL,             AL_M1445,       "M1445"),
        DEVICE( AL,             AL_M1449,       "M1449"),
        DEVICE( AL,             AL_M1451,       "M1451"),
@@ -210,32 +282,58 @@ struct pci_dev_info dev_info[] = {
        DEVICE( AL,             AL_M1489,       "M1489"),
        DEVICE( AL,             AL_M1511,       "M1511"),
        DEVICE( AL,             AL_M1513,       "M1513"),
+       DEVICE( AL,             AL_M1521,       "M1521"),
+       DEVICE( AL,             AL_M1523,       "M1523"),
+       DEVICE( AL,             AL_M1531,       "M1531 Aladdin IV"),
+       DEVICE( AL,             AL_M1533,       "M1533 Aladdin IV"),
+       DEVICE( AL,             AL_M3307,       "M3307 MPEG-1 decoder"),
        DEVICE( AL,             AL_M4803,       "M4803"),
+       DEVICE( AL,             AL_M5219,       "M5219"),
+       DEVICE( AL,             AL_M5229,       "M5229 TXpro"),
+       DEVICE( AL,             AL_M5237,       "M5237 USB"),
+       DEVICE( SURECOM,        SURECOM_NE34,   "NE-34PCI LAN"),
        DEVICE( NEOMAGIC,       NEOMAGIC_MAGICGRAPH_NM2070,     "Magicgraph NM2070"),
        DEVICE( NEOMAGIC,       NEOMAGIC_MAGICGRAPH_128V, "MagicGraph 128V"),
+       DEVICE( NEOMAGIC,       NEOMAGIC_MAGICGRAPH_128ZV, "MagicGraph 128ZV"),
+       DEVICE( NEOMAGIC,       NEOMAGIC_MAGICGRAPH_NM2160, "MagicGraph NM2160"),
        DEVICE( ASP,            ASP_ABP940,     "ABP940"),
        DEVICE( ASP,            ASP_ABP940U,    "ABP940U"),
+       DEVICE( ASP,            ASP_ABP940UW,   "ABP940UW"),
+       DEVICE( MACRONIX,       MACRONIX_MX98713,"MX98713"),
+       DEVICE( MACRONIX,       MACRONIX_MX987x5,"MX98715 / MX98725"),
        DEVICE( CERN,           CERN_SPSB_PMC,  "STAR/RD24 SCI-PCI (PMC)"),
        DEVICE( CERN,           CERN_SPSB_PCI,  "STAR/RD24 SCI-PCI (PMC)"),
+       DEVICE( CERN,           CERN_HIPPI_DST, "HIPPI destination"),
+       DEVICE( CERN,           CERN_HIPPI_SRC, "HIPPI source"),
        DEVICE( IMS,            IMS_8849,       "8849"),
        DEVICE( TEKRAM2,        TEKRAM2_690c,   "DC690c"),
        DEVICE( TUNDRA,         TUNDRA_CA91C042,"CA91C042 Universe"),
        DEVICE( AMCC,           AMCC_MYRINET,   "Myrinet PCI (M2-PCI-32)"),
        DEVICE( AMCC,           AMCC_S5933,     "S5933"),
+       DEVICE( AMCC,           AMCC_S5933_HEPC3,"S5933 Traquair HEPC3"),
        DEVICE( INTERG,         INTERG_1680,    "IGA-1680"),
        DEVICE( INTERG,         INTERG_1682,    "IGA-1682"),
        DEVICE( REALTEK,        REALTEK_8029,   "8029"),
        DEVICE( REALTEK,        REALTEK_8129,   "8129"),
+       DEVICE( REALTEK,        REALTEK_8139,   "8139"),
        DEVICE( TRUEVISION,     TRUEVISION_T1000,"TARGA 1000"),
        DEVICE( INIT,           INIT_320P,      "320 P"),
+       DEVICE( INIT,           INIT_360P,      "360 P"),
        DEVICE( VIA,            VIA_82C505,     "VT 82C505"),
        DEVICE( VIA,            VIA_82C561,     "VT 82C561"),
-       DEVICE( VIA,            VIA_82C586_1,   "VT 82C586 Apollo VP-1"),
+       DEVICE( VIA,            VIA_82C586_1,   "VT 82C586 Apollo IDE"),
        DEVICE( VIA,            VIA_82C576,     "VT 82C576 3V"),
-       DEVICE( VIA,            VIA_82C585,     "VT 82C585VP Apollo VP-1"),
-       DEVICE( VIA,            VIA_82C586_0,   "VT 82C586 Apollo VP-1"),
+       DEVICE( VIA,            VIA_82C585,     "VT 82C585 Apollo VP1/VPX"),
+       DEVICE( VIA,            VIA_82C586_0,   "VT 82C586 Apollo ISA"),
+       DEVICE( VIA,            VIA_82C595,     "VT 82C595 Apollo VP2"),
+       DEVICE( VIA,            VIA_82C597_0,   "VT 82C597 Apollo VP3"),
        DEVICE( VIA,            VIA_82C926,     "VT 82C926 Amazon"),
        DEVICE( VIA,            VIA_82C416,     "VT 82C416MV"),
+       DEVICE( VIA,            VIA_82C595_97,  "VT 82C595 Apollo VP2/97"),
+       DEVICE( VIA,            VIA_82C586_2,   "VT 82C586 Apollo USB"),
+       DEVICE( VIA,            VIA_82C586_3,   "VT 82C586B Apollo ACPI"),
+       DEVICE( VIA,            VIA_86C100A,    "VT 86C100A"),
+       DEVICE( VIA,            VIA_82C597_1,   "VT 82C597 Apollo VP3 AGP"),
        DEVICE( VORTEX,         VORTEX_GDT60x0, "GDT 60x0"),
        DEVICE( VORTEX,         VORTEX_GDT6000B,"GDT 6000b"),
        DEVICE( VORTEX,         VORTEX_GDT6x10, "GDT 6110/6510"),
@@ -250,31 +348,66 @@ struct pci_dev_info dev_info[] = {
        DEVICE( VORTEX,         VORTEX_GDT6x25, "GDT 6125/6525"),
        DEVICE( VORTEX,         VORTEX_GDT6535, "GDT 6535"),
        DEVICE( VORTEX,         VORTEX_GDT6555, "GDT 6555"),
+       DEVICE( VORTEX,         VORTEX_GDT6x17RP,"GDT 6117RP/6517RP"),
+       DEVICE( VORTEX,         VORTEX_GDT6x27RP,"GDT 6127RP/6527RP"),
+       DEVICE( VORTEX,         VORTEX_GDT6537RP,"GDT 6537RP"),
+       DEVICE( VORTEX,         VORTEX_GDT6557RP,"GDT 6557RP"),
+       DEVICE( VORTEX,         VORTEX_GDT6x11RP,"GDT 6111RP/6511RP"),
+       DEVICE( VORTEX,         VORTEX_GDT6x21RP,"GDT 6121RP/6521RP"),
+       DEVICE( VORTEX,         VORTEX_GDT6x17RP1,"GDT 6117RP1/6517RP1"),
+       DEVICE( VORTEX,         VORTEX_GDT6x27RP1,"GDT 6127RP1/6527RP1"),
+       DEVICE( VORTEX,         VORTEX_GDT6537RP1,"GDT 6537RP1"),
+       DEVICE( VORTEX,         VORTEX_GDT6557RP1,"GDT 6557RP1"),
+       DEVICE( VORTEX,         VORTEX_GDT6x11RP1,"GDT 6111RP1/6511RP1"),
+       DEVICE( VORTEX,         VORTEX_GDT6x21RP1,"GDT 6121RP1/6521RP1"),
+       DEVICE( VORTEX,         VORTEX_GDT6x17RP2,"GDT 6117RP2/6517RP2"),
+       DEVICE( VORTEX,         VORTEX_GDT6x27RP2,"GDT 6127RP2/6527RP2"),
+       DEVICE( VORTEX,         VORTEX_GDT6537RP2,"GDT 6537RP2"),
+       DEVICE( VORTEX,         VORTEX_GDT6557RP2,"GDT 6557RP2"),
+       DEVICE( VORTEX,         VORTEX_GDT6x11RP2,"GDT 6111RP2/6511RP2"),
+       DEVICE( VORTEX,         VORTEX_GDT6x21RP2,"GDT 6121RP2/6521RP2"),
        DEVICE( EF,             EF_ATM_FPGA,            "155P-MF1 (FPGA)"),
        DEVICE( EF,             EF_ATM_ASIC,    "155P-MF1 (ASIC)"),
        DEVICE( FORE,           FORE_PCA200PC, "PCA-200PC"),
        DEVICE( FORE,           FORE_PCA200E,    "PCA-200E"),
        DEVICE( IMAGINGTECH,    IMAGINGTECH_ICPCI, "MVC IC-PCI"),
        DEVICE( PHILIPS,        PHILIPS_SAA7146,"SAA7146"),
-       DEVICE( PLX,            PLX_9060,       "PCI9060 i960 bridge"),
+       DEVICE( CYCLONE,        CYCLONE_SDK,    "SDK"),
        DEVICE( ALLIANCE,       ALLIANCE_PROMOTIO, "Promotion-6410"),
        DEVICE( ALLIANCE,       ALLIANCE_PROVIDEO, "Provideo"),
+       DEVICE( ALLIANCE,       ALLIANCE_AT24,  "AT24"),
+       DEVICE( ALLIANCE,       ALLIANCE_AT3D,  "AT3D"),
        DEVICE( VMIC,           VMIC_VME,       "VMIVME-7587"),
+       DEVICE( DIGI,           DIGI_EPC,       "AccelPort EPC"),
        DEVICE( DIGI,           DIGI_RIGHTSWITCH, "RightSwitch SE-6"),
+       DEVICE( DIGI,           DIGI_XEM,       "AccelPort Xem"),
+       DEVICE( DIGI,           DIGI_XR,        "AccelPort Xr"),
+       DEVICE( DIGI,           DIGI_CX,        "AccelPort C/X"),
+       DEVICE( DIGI,           DIGI_XRJ,       "AccelPort Xr/J"),
+       DEVICE( DIGI,           DIGI_EPCJ,      "AccelPort EPC/J"),
+       DEVICE( DIGI,           DIGI_XR_920,    "AccelPort Xr 920"),
        DEVICE( MUTECH,         MUTECH_MV1000,  "MV-1000"),
        DEVICE( RENDITION,      RENDITION_VERITE,"Verite 1000"),
+       DEVICE( RENDITION,      RENDITION_VERITE2100,"Verite 2100"),
        DEVICE( TOSHIBA,        TOSHIBA_601,    "Laptop"),
+       DEVICE( TOSHIBA,        TOSHIBA_TOPIC95,"ToPIC95"),
+       DEVICE( TOSHIBA,        TOSHIBA_TOPIC97,"ToPIC97"),
        DEVICE( RICOH,          RICOH_RL5C466,  "RL5C466"),
+       DEVICE( ARTOP,          ARTOP_ATP850UF, "ATP850UF"),
        DEVICE( ZEITNET,        ZEITNET_1221,   "1221"),
        DEVICE( ZEITNET,        ZEITNET_1225,   "1225"),
        DEVICE( OMEGA,          OMEGA_82C092G,  "82C092G"),
+       DEVICE( LITEON,         LITEON_LNE100TX,"LNE100TX"),
        DEVICE( NP,             NP_PCI_FDDI,    "NP-PCI"),       
+       DEVICE( ATT,            ATT_L56XMF,     "L56xMF"),
        DEVICE( SPECIALIX,      SPECIALIX_XIO,  "XIO/SIO host"),
        DEVICE( SPECIALIX,      SPECIALIX_RIO,  "RIO host"),
+       DEVICE( AURAVISION,     AURAVISION_VXP524,"VXP524"),
        DEVICE( IKON,           IKON_10115,     "10115 Greensheet"),
        DEVICE( IKON,           IKON_10117,     "10117 Greensheet"),
        DEVICE( ZORAN,          ZORAN_36057,    "ZR36057"),
        DEVICE( ZORAN,          ZORAN_36120,    "ZR36120"),
+       DEVICE( KINETIC,        KINETIC_2915,   "2915 CAMAC"),
        DEVICE( COMPEX,         COMPEX_ENET100VG4, "Readylink ENET100-VG4"),
        DEVICE( COMPEX,         COMPEX_RL2000,  "ReadyLink 2000"),
        DEVICE( RP,             RP8OCTA,        "RocketPort 8 Oct"),
@@ -285,19 +418,32 @@ struct pci_dev_info dev_info[] = {
        DEVICE( CYCLADES,       CYCLOM_Y_Hi,    "Cyclom-Y above 1Mbyte"),
        DEVICE( CYCLADES,       CYCLOM_Z_Lo,    "Cyclom-Z below 1Mbyte"),
        DEVICE( CYCLADES,       CYCLOM_Z_Hi,    "Cyclom-Z above 1Mbyte"),
+       DEVICE( ESSENTIAL,      ESSENTIAL_ROADRUNNER,"Roadrunner serial HIPPI"),
+       DEVICE( O2,             O2_6832,        "6832"),
        DEVICE( 3DFX,           3DFX_VOODOO,    "Voodoo"),
+       DEVICE( 3DFX,           3DFX_VOODOO2,   "Voodoo2"),
        DEVICE( SIGMADES,       SIGMADES_6425,  "REALmagic64/GX"),
+       DEVICE( STALLION,       STALLION_ECHPCI832,"EasyConnection 8/32"),
+       DEVICE( STALLION,       STALLION_ECHPCI864,"EasyConnection 8/64"),
+       DEVICE( STALLION,       STALLION_EIOPCI,"EasyIO"),
        DEVICE( OPTIBASE,       OPTIBASE_FORGE, "MPEG Forge"),
        DEVICE( OPTIBASE,       OPTIBASE_FUSION,"MPEG Fusion"),
        DEVICE( OPTIBASE,       OPTIBASE_VPLEX, "VideoPlex"),
        DEVICE( OPTIBASE,       OPTIBASE_VPLEXCC,"VideoPlex CC"),
        DEVICE( OPTIBASE,       OPTIBASE_VQUEST,"VideoQuest"),
+       DEVICE( SATSAGEM,       SATSAGEM_PCR2101,"PCR2101 DVB receiver"),
+       DEVICE( SATSAGEM,       SATSAGEM_TELSATTURBO,"Telsat Turbo DVB"),
+       DEVICE( ENSONIQ,        ENSONIQ_AUDIOPCI,"AudioPCI"),
+       DEVICE( PICTUREL,       PICTUREL_PCIVST,"PCIVST"),
+       DEVICE( NVIDIA_SGS,     NVIDIA_SGS_RIVA128,     "Riva 128"),
+       DEVICE( CBOARDS,        CBOARDS_DAS1602_16,"DAS1602/16"),
        DEVICE( SYMPHONY,       SYMPHONY_101,   "82C101"),
        DEVICE( TEKRAM,         TEKRAM_DC290,   "DC-290"),
        DEVICE( 3DLABS,         3DLABS_300SX,   "GLINT 300SX"),
        DEVICE( 3DLABS,         3DLABS_500TX,   "GLINT 500TX"),
        DEVICE( 3DLABS,         3DLABS_DELTA,   "GLINT Delta"),
        DEVICE( 3DLABS,         3DLABS_PERMEDIA,"PERMEDIA"),
+       DEVICE( 3DLABS,         3DLABS_MX,      "GLINT MX"),
        DEVICE( AVANCE,         AVANCE_ALG2064, "ALG2064i"),
        DEVICE( AVANCE,         AVANCE_2302,    "ALG-2302"),
        DEVICE( NETVIN,         NETVIN_NV5000SC,"NV5000"),
@@ -318,6 +464,10 @@ struct pci_dev_info dev_info[] = {
        DEVICE( S3,             S3_PLATO_PXG,   "PLATO/PX (graphics)"),
        DEVICE( S3,             S3_ViRGE_DXGX,  "ViRGE/DX or /GX"),
        DEVICE( S3,             S3_ViRGE_GX2,   "ViRGE/GX2"),
+       DEVICE( S3,             S3_ViRGE_MX,    "ViRGE/MX"),
+       DEVICE( S3,             S3_ViRGE_MXP,   "ViRGE/MX+"),
+       DEVICE( S3,             S3_ViRGE_MXPMV, "ViRGE/MX+MV"),
+       DEVICE( S3,             S3_SONICVIBES,  "SonicVibes"),
        DEVICE( INTEL,          INTEL_82375,    "82375EB"),
        BRIDGE( INTEL,          INTEL_82424,    "82424ZX Saturn",       0x00),
        DEVICE( INTEL,          INTEL_82378,    "82378IB"),
@@ -335,22 +485,29 @@ struct pci_dev_info dev_info[] = {
        DEVICE( INTEL,          INTEL_82371MX,  "430MX - 82371MX MPIIX"),
        DEVICE( INTEL,          INTEL_82437MX,  "430MX - 82437MX MTSC"),
        DEVICE( INTEL,          INTEL_82441,    "82441FX Natoma"),
+       DEVICE( INTEL,          INTEL_82380FB,  "82380FB Mobile"),
        DEVICE( INTEL,          INTEL_82439,    "82439HX Triton II"),
-       DEVICE( INTEL,          INTEL_82371SB_0,"82371SB Natoma/Triton II PIIX3"),
-       DEVICE( INTEL,          INTEL_82371SB_1,"82371SB Natoma/Triton II PIIX3"),
-       DEVICE( INTEL,          INTEL_82371SB_2,"82371SB Natoma/Triton II PIIX3"),
+       DEVICE( INTEL,          INTEL_82371SB_0,"82371SB PIIX3 ISA"),
+       DEVICE( INTEL,          INTEL_82371SB_1,"82371SB PIIX3 IDE"),
+       DEVICE( INTEL,          INTEL_82371SB_2,"82371SB PIIX3 USB"),
        DEVICE( INTEL,          INTEL_82437VX,  "82437VX Triton II"),
        DEVICE( INTEL,          INTEL_82439TX,  "82439TX"),
-       DEVICE( INTEL,          INTEL_82371AB_0,"82371AB PIIX4"),
-       DEVICE( INTEL,          INTEL_82371AB,  "82371AB 430TX PIIX4"),
-       DEVICE( INTEL,          INTEL_82371AB_2,"82371AB PIIX4"),
-       DEVICE( INTEL,          INTEL_82371AB_3,"82371AB PIIX4 Power Management"),
+       DEVICE( INTEL,          INTEL_82371AB_0,"82371AB PIIX4 ISA"),
+       DEVICE( INTEL,          INTEL_82371AB,  "82371AB PIIX4 IDE"),
+       DEVICE( INTEL,          INTEL_82371AB_2,"82371AB PIIX4 USB"),
+       DEVICE( INTEL,          INTEL_82371AB_3,"82371AB PIIX4 ACPI"),
+       DEVICE( INTEL,          INTEL_82443LX_0,"440LX - 82443LX PAC Host"),
+       DEVICE( INTEL,          INTEL_82443LX_1,"440LX - 82443LX PAC AGP"),
+       DEVICE( INTEL,          INTEL_82443BX_0,"440BX - 82443BX Host"),
+       DEVICE( INTEL,          INTEL_82443BX_1,"440BX - 82443BX AGP"),
+       DEVICE( INTEL,          INTEL_82443BX_2,"440BX - 82443BX Host (no AGP)"),
        DEVICE( INTEL,          INTEL_P6,       "Orion P6"),
        DEVICE( INTEL,          INTEL_82450GX,  "82450GX Orion P6"),
        DEVICE( KTI,            KTI_ET32P2,     "ET32P2"),
-       DEVICE( ADAPTEC,        ADAPTEC_7810,   "AIC-7810 RAID Controller"),
+       DEVICE( ADAPTEC,        ADAPTEC_7810,   "AIC-7810 RAID"),
        DEVICE( ADAPTEC,        ADAPTEC_7850,   "AIC-7850"),
        DEVICE( ADAPTEC,        ADAPTEC_7855,   "AIC-7855"),
+       DEVICE( ADAPTEC,        ADAPTEC_5800,   "AIC-5800"),
        DEVICE( ADAPTEC,        ADAPTEC_7860,   "AIC-7860"),
        DEVICE( ADAPTEC,        ADAPTEC_7861,   "AIC-7861"),
        DEVICE( ADAPTEC,        ADAPTEC_7870,   "AIC-7870"),
@@ -364,7 +521,9 @@ struct pci_dev_info dev_info[] = {
        DEVICE( ADAPTEC,        ADAPTEC_7882,   "AIC-7882U"),
        DEVICE( ADAPTEC,        ADAPTEC_7883,   "AIC-7883U"),
        DEVICE( ADAPTEC,        ADAPTEC_7884,   "AIC-7884U"),
+       DEVICE( ADAPTEC,        ADAPTEC_1030,   "ABA-1030 DVB receiver"),
        DEVICE( ATRONICS,       ATRONICS_2015,  "IDE-2015PL"),
+       DEVICE( TIGERJET,       TIGERJET_300,   "Tiger300 ISDN"),
        DEVICE( ARK,            ARK_STING,      "Stingray"),
        DEVICE( ARK,            ARK_STINGARK,   "Stingray ARK 2000PV"),
        DEVICE( ARK,            ARK_2000MT,     "2000MT")
index 1770811be121014e27718f1daf34a260bdd39299..37d1fb19a7d631fffd67d05bd36161942907e13c 100644 (file)
 
 /*
  * Vendor and card ID's: sort these numerically according to vendor
- * (and according to card ID within vendor)
+ * (and according to card ID within vendor). Send all updates to
+ * <linux-pcisupport@cck.uni-kl.de>.
  */
 #define PCI_VENDOR_ID_COMPAQ           0x0e11
 #define PCI_DEVICE_ID_COMPAQ_1280      0x3033
-#define PCI_DEVICE_ID_COMPAQ_NETELL100 0xae32
-#define PCI_DEVICE_ID_COMPAQ_NETELL10  0xae34
-#define PCI_DEVICE_ID_COMPAQ_NETFLEX3  0xae35
+#define PCI_DEVICE_ID_COMPAQ_TRIFLEX   0x4000
+#define PCI_DEVICE_ID_COMPAQ_SMART2P   0xae10
+#define PCI_DEVICE_ID_COMPAQ_NETEL100  0xae32
+#define PCI_DEVICE_ID_COMPAQ_NETEL10   0xae34
+#define PCI_DEVICE_ID_COMPAQ_NETFLEX3I 0xae35
+#define PCI_DEVICE_ID_COMPAQ_NETEL100D 0xae40
+#define PCI_DEVICE_ID_COMPAQ_NETEL100PI        0xae43
+#define PCI_DEVICE_ID_COMPAQ_NETEL100I 0xb011
 #define PCI_DEVICE_ID_COMPAQ_THUNDER   0xf130
+#define PCI_DEVICE_ID_COMPAQ_NETFLEX3B 0xf150
 
 #define PCI_VENDOR_ID_NCR              0x1000
 #define PCI_DEVICE_ID_NCR_53C810       0x0001
 #define PCI_DEVICE_ID_NCR_53C895       0x000c
 #define PCI_DEVICE_ID_NCR_53C885       0x000d
 #define PCI_DEVICE_ID_NCR_53C875       0x000f
+#define PCI_DEVICE_ID_NCR_53C875J      0x008f
 
 #define PCI_VENDOR_ID_ATI              0x1002
 #define PCI_DEVICE_ID_ATI_68800                0x4158
 #define PCI_DEVICE_ID_ATI_215CT222     0x4354
 #define PCI_DEVICE_ID_ATI_210888CX     0x4358
+#define PCI_DEVICE_ID_ATI_215GB                0x4742
+#define PCI_DEVICE_ID_ATI_215GD                0x4744
+#define PCI_DEVICE_ID_ATI_215GI                0x4749
+#define PCI_DEVICE_ID_ATI_215GP                0x4750
+#define PCI_DEVICE_ID_ATI_215GQ                0x4751
 #define PCI_DEVICE_ID_ATI_215GT                0x4754
+#define PCI_DEVICE_ID_ATI_215GTB       0x4755
 #define PCI_DEVICE_ID_ATI_210888GX     0x4758
+#define PCI_DEVICE_ID_ATI_215LG                0x4c47
+#define PCI_DEVICE_ID_ATI_264LT                0x4c54
 #define PCI_DEVICE_ID_ATI_264VT                0x5654
 
 #define PCI_VENDOR_ID_VLSI             0x1004
 #define PCI_DEVICE_ID_VLSI_82C593      0x0006
 #define PCI_DEVICE_ID_VLSI_82C594      0x0007
 #define PCI_DEVICE_ID_VLSI_82C597      0x0009
+#define PCI_DEVICE_ID_VLSI_82C541      0x000c
+#define PCI_DEVICE_ID_VLSI_82C543      0x000d
+#define PCI_DEVICE_ID_VLSI_82C532      0x0101
+#define PCI_DEVICE_ID_VLSI_82C534      0x0102
+#define PCI_DEVICE_ID_VLSI_82C535      0x0104
+#define PCI_DEVICE_ID_VLSI_82C147      0x0105
 #define PCI_DEVICE_ID_VLSI_VAS96011    0x0702
 
 #define PCI_VENDOR_ID_ADL              0x1005
 #define PCI_DEVICE_ID_ADL_2301         0x2301
 
 #define PCI_VENDOR_ID_NS               0x100b
+#define PCI_DEVICE_ID_NS_87415         0x0002
 #define PCI_DEVICE_ID_NS_87410         0xd001
 
 #define PCI_VENDOR_ID_TSENG            0x100c
 #define PCI_DEVICE_ID_DEC_TULIP                0x0002
 #define PCI_DEVICE_ID_DEC_TGA          0x0004
 #define PCI_DEVICE_ID_DEC_TULIP_FAST   0x0009
+#define PCI_DEVICE_ID_DEC_TGA2         0x000D
 #define PCI_DEVICE_ID_DEC_FDDI         0x000F
 #define PCI_DEVICE_ID_DEC_TULIP_PLUS   0x0014
 #define PCI_DEVICE_ID_DEC_21142                0x0019
 #define PCI_DEVICE_ID_DEC_21052                0x0021
+#define PCI_DEVICE_ID_DEC_21150                0x0022
 #define PCI_DEVICE_ID_DEC_21152                0x0024
 
 #define PCI_VENDOR_ID_CIRRUS           0x1013
 
 #define PCI_VENDOR_ID_IBM              0x1014
 #define PCI_DEVICE_ID_IBM_FIRE_CORAL   0x000a
+#define PCI_DEVICE_ID_IBM_TR           0x0018
 #define PCI_DEVICE_ID_IBM_82G2675      0x001d
+#define PCI_DEVICE_ID_IBM_MCA          0x0020
 #define PCI_DEVICE_ID_IBM_82351                0x0022
+#define PCI_DEVICE_ID_IBM_SERVERAID    0x002e
+#define PCI_DEVICE_ID_IBM_TR_WAKE      0x003e
+#define PCI_DEVICE_ID_IBM_3780IDSP     0x007d
 
 #define PCI_VENDOR_ID_WD               0x101c
 #define PCI_DEVICE_ID_WD_7197          0x3296
 #define PCI_DEVICE_ID_AMD_SCSI         0x2020
 
 #define PCI_VENDOR_ID_TRIDENT          0x1023
+#define PCI_DEVICE_ID_TRIDENT_9397     0x9397
 #define PCI_DEVICE_ID_TRIDENT_9420     0x9420
 #define PCI_DEVICE_ID_TRIDENT_9440     0x9440
 #define PCI_DEVICE_ID_TRIDENT_9660     0x9660
+#define PCI_DEVICE_ID_TRIDENT_9750     0x9750
 
 #define PCI_VENDOR_ID_AI               0x1025
 #define PCI_DEVICE_ID_AI_M1435         0x1435
 #define PCI_DEVICE_ID_MATROX_MIL       0x0519
 #define PCI_DEVICE_ID_MATROX_MYS       0x051A
 #define PCI_DEVICE_ID_MATROX_MIL_2     0x051b
+#define PCI_DEVICE_ID_MATROX_MIL_2_AGP 0x051f
 #define PCI_DEVICE_ID_MATROX_MGA_IMP   0x0d10
 
 #define PCI_VENDOR_ID_CT               0x102c
 #define PCI_DEVICE_ID_CT_65548         0x00dc
 #define PCI_DEVICE_ID_CT_65550         0x00e0
 #define PCI_DEVICE_ID_CT_65554         0x00e4
+#define PCI_DEVICE_ID_CT_65555         0x00e5
 
 #define PCI_VENDOR_ID_MIRO             0x1031
 #define PCI_DEVICE_ID_MIRO_36050       0x5601
 
+#define PCI_VENDOR_ID_NEC              0x1033
+#define PCI_DEVICE_ID_NEC_PCX2         0x0046
+
 #define PCI_VENDOR_ID_FD               0x1036
 #define PCI_DEVICE_ID_FD_36C70         0x0000
 
 #define PCI_VENDOR_ID_SI               0x1039
-#define PCI_DEVICE_ID_SI_6201          0x0001
+#define PCI_DEVICE_ID_SI_5591_AGP      0x0001
 #define PCI_DEVICE_ID_SI_6202          0x0002
-#define PCI_DEVICE_ID_SI_6205          0x0205
 #define PCI_DEVICE_ID_SI_503           0x0008
+#define PCI_DEVICE_ID_SI_ACPI          0x0009
+#define PCI_DEVICE_ID_SI_5597_VGA      0x0200
+#define PCI_DEVICE_ID_SI_6205          0x0205
 #define PCI_DEVICE_ID_SI_501           0x0406
 #define PCI_DEVICE_ID_SI_496           0x0496
 #define PCI_DEVICE_ID_SI_601           0x0601
 #define PCI_DEVICE_ID_SI_5511          0x5511
 #define PCI_DEVICE_ID_SI_5513          0x5513
 #define PCI_DEVICE_ID_SI_5571          0x5571
+#define PCI_DEVICE_ID_SI_5591          0x5591
+#define PCI_DEVICE_ID_SI_5597          0x5597
 #define PCI_DEVICE_ID_SI_7001          0x7001
 
 #define PCI_VENDOR_ID_HP               0x103c
 #define PCI_VENDOR_ID_PCTECH           0x1042
 #define PCI_DEVICE_ID_PCTECH_RZ1000    0x1000
 #define PCI_DEVICE_ID_PCTECH_RZ1001    0x1001
+#define PCI_DEVICE_ID_PCTECH_SAMURAI_0 0x3000
+#define PCI_DEVICE_ID_PCTECH_SAMURAI_1 0x3010
+#define PCI_DEVICE_ID_PCTECH_SAMURAI_IDE 0x3020
 
 #define PCI_VENDOR_ID_DPT               0x1044   
 #define PCI_DEVICE_ID_DPT               0xa400  
 #define PCI_DEVICE_ID_OPTI_82C557      0xc557
 #define PCI_DEVICE_ID_OPTI_82C558      0xc558
 #define PCI_DEVICE_ID_OPTI_82C621      0xc621
+#define PCI_DEVICE_ID_OPTI_82C700      0xc700
+#define PCI_DEVICE_ID_OPTI_82C701      0xc701
+#define PCI_DEVICE_ID_OPTI_82C814      0xc814
 #define PCI_DEVICE_ID_OPTI_82C822      0xc822
+#define PCI_DEVICE_ID_OPTI_82C825      0xd568
 
 #define PCI_VENDOR_ID_SGS              0x104a
 #define PCI_DEVICE_ID_SGS_2000         0x0008
 #define PCI_DEVICE_ID_BUSLOGIC_FLASHPOINT     0x8130
 
 #define PCI_VENDOR_ID_TI               0x104c
+#define PCI_DEVICE_ID_TI_TVP4010       0x3d04
+#define PCI_DEVICE_ID_TI_TVP4020       0x3d07
 #define PCI_DEVICE_ID_TI_PCI1130       0xac12
 #define PCI_DEVICE_ID_TI_PCI1131       0xac15
+#define PCI_DEVICE_ID_TI_PCI1250       0xac16
 
 #define PCI_VENDOR_ID_OAK              0x104e
 #define PCI_DEVICE_ID_OAK_OTI107       0x0107
 #define PCI_DEVICE_ID_MOTOROLA_RAVEN   0x4801
 
 #define PCI_VENDOR_ID_PROMISE          0x105a
+#define PCI_DEVICE_ID_PROMISE_20246    0x4d33
 #define PCI_DEVICE_ID_PROMISE_5300     0x5300
 
 #define PCI_VENDOR_ID_N9               0x105d
 #define PCI_DEVICE_ID_N9_I128          0x2309
 #define PCI_DEVICE_ID_N9_I128_2                0x2339
+#define PCI_DEVICE_ID_N9_I128_T2R      0x493d
 
 #define PCI_VENDOR_ID_UMC              0x1060
 #define PCI_DEVICE_ID_UMC_UM8673F      0x0101
 #define PCI_VENDOR_ID_X                        0x1061
 #define PCI_DEVICE_ID_X_AGX016         0x0001
 
+#define PCI_VENDOR_ID_PICOP            0x1066
+#define PCI_DEVICE_ID_PICOP_PT86C52X   0x0001
+#define PCI_DEVICE_ID_PICOP_PT80C524   0x8002
+
 #define PCI_VENDOR_ID_APPLE            0x106b
 #define PCI_DEVICE_ID_APPLE_BANDIT     0x0001
 #define PCI_DEVICE_ID_APPLE_GC         0x0002
 #define PCI_DEVICE_ID_QLOGIC_ISP1020   0x1020
 #define PCI_DEVICE_ID_QLOGIC_ISP1022   0x1022
 
+#define PCI_VENDOR_ID_CYRIX            0x1078
+#define PCI_DEVICE_ID_CYRIX_5510       0x0000
+#define PCI_DEVICE_ID_CYRIX_PCI_MASTER 0x0001
+#define PCI_DEVICE_ID_CYRIX_5520       0x0002
+#define PCI_DEVICE_ID_CYRIX_5530_LEGACY        0x0100
+#define PCI_DEVICE_ID_CYRIX_5530_SMI   0x0101
+#define PCI_DEVICE_ID_CYRIX_5530_IDE   0x0102
+#define PCI_DEVICE_ID_CYRIX_5530_AUDIO 0x0103
+#define PCI_DEVICE_ID_CYRIX_5530_VIDEO 0x0104
+
 #define PCI_VENDOR_ID_LEADTEK          0x107d
 #define PCI_DEVICE_ID_LEADTEK_805      0x0000
 
 #define PCI_VENDOR_ID_CONTAQ           0x1080
 #define PCI_DEVICE_ID_CONTAQ_82C599    0x0600
+#define PCI_DEVICE_ID_CONTAQ_82C693    0xc693
 
 #define PCI_VENDOR_ID_FOREX            0x1083
 
 #define PCI_DEVICE_ID_OLICOM_OC2326    0x0014
 #define PCI_DEVICE_ID_OLICOM_OC6151    0x0021
 
+#define PCI_VENDOR_ID_SUN              0x108e
+#define PCI_DEVICE_ID_SUN_EBUS         0x1000
+#define PCI_DEVICE_ID_SUN_HAPPYMEAL    0x1001
+#define PCI_DEVICE_ID_SUN_SIMBA                0x5000
+#define PCI_DEVICE_ID_SUN_PBM          0x8000
+#define PCI_DEVICE_ID_SUN_SABRE                0xa000
+
 #define PCI_VENDOR_ID_CMD              0x1095
 #define PCI_DEVICE_ID_CMD_640          0x0640
 #define PCI_DEVICE_ID_CMD_643          0x0643
 
 #define PCI_VENDOR_ID_BROOKTREE                0x109e
 #define PCI_DEVICE_ID_BROOKTREE_848    0x0350
+#define PCI_DEVICE_ID_BROOKTREE_849A   0x0351
+#define PCI_DEVICE_ID_BROOKTREE_8474   0x8474
 
 #define PCI_VENDOR_ID_SIERRA           0x10a8
 #define PCI_DEVICE_ID_SIERRA_STB       0x0000
 #define PCI_VENDOR_ID_DATABOOK         0x10b3
 #define PCI_DEVICE_ID_DATABOOK_87144   0xb106
 
+#define PCI_VENDOR_ID_PLX              0x10b5
+#define PCI_DEVICE_ID_PLX_9080         0x9080
+
+#define PCI_VENDOR_ID_MADGE            0x10b6
+#define PCI_DEVICE_ID_MADGE_MK2                0x0002
+
 #define PCI_VENDOR_ID_3COM             0x10b7
+#define PCI_DEVICE_ID_3COM_3C339       0x3390
 #define PCI_DEVICE_ID_3COM_3C590       0x5900
 #define PCI_DEVICE_ID_3COM_3C595TX     0x5950
 #define PCI_DEVICE_ID_3COM_3C595T4     0x5951
 #define PCI_DEVICE_ID_3COM_3C900TPO    0x9000
 #define PCI_DEVICE_ID_3COM_3C900COMBO  0x9001
 #define PCI_DEVICE_ID_3COM_3C905TX     0x9050
+#define PCI_DEVICE_ID_3COM_3C905T4     0x9051
+#define PCI_DEVICE_ID_3COM_3C905B_TX   0x9055
 
 #define PCI_VENDOR_ID_SMC              0x10b8
+#define PCI_DEVICE_ID_SMC_EPIC100      0x0005
 
 #define PCI_VENDOR_ID_AL               0x10b9
 #define PCI_DEVICE_ID_AL_M1445         0x1445
 #define PCI_DEVICE_ID_AL_M1489         0x1489
 #define PCI_DEVICE_ID_AL_M1511         0x1511
 #define PCI_DEVICE_ID_AL_M1513         0x1513
+#define PCI_DEVICE_ID_AL_M1521         0x1521
+#define PCI_DEVICE_ID_AL_M1523         0x1523
+#define PCI_DEVICE_ID_AL_M1531         0x1531
+#define PCI_DEVICE_ID_AL_M1533         0x1533
+#define PCI_DEVICE_ID_AL_M3307         0x3307
 #define PCI_DEVICE_ID_AL_M4803         0x5215
+#define PCI_DEVICE_ID_AL_M5219         0x5219
+#define PCI_DEVICE_ID_AL_M5229         0x5229
+#define PCI_DEVICE_ID_AL_M5237         0x5237
+#define PCI_DEVICE_ID_AL_M7101         0x7101
 
 #define PCI_VENDOR_ID_MITSUBISHI       0x10ba
 
+#define PCI_VENDOR_ID_SURECOM          0x10bd
+#define PCI_DEVICE_ID_SURECOM_NE34     0x0e34
+
 #define PCI_VENDOR_ID_NEOMAGIC          0x10c8
 #define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_NM2070 0x0001
 #define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_128V 0x0002
+#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_128ZV 0x0003
+#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_NM2160 0x0004
 
 #define PCI_VENDOR_ID_ASP              0x10cd
 #define PCI_DEVICE_ID_ASP_ABP940       0x1200
 #define PCI_DEVICE_ID_ASP_ABP940U      0x1300
+#define PCI_DEVICE_ID_ASP_ABP940UW     0x2300
+
+#define PCI_VENDOR_ID_MACRONIX         0x10d9
+#define PCI_DEVICE_ID_MACRONIX_MX98713 0x0512
+#define PCI_DEVICE_ID_MACRONIX_MX987x5 0x0531
 
 #define PCI_VENDOR_ID_CERN             0x10dc
 #define PCI_DEVICE_ID_CERN_SPSB_PMC    0x0001
 #define PCI_DEVICE_ID_CERN_SPSB_PCI    0x0002
+#define PCI_DEVICE_ID_CERN_HIPPI_DST   0x0021
+#define PCI_DEVICE_ID_CERN_HIPPI_SRC   0x0022
+
+#define PCI_VENDOR_ID_NVIDIA           0x10de
 
 #define PCI_VENDOR_ID_IMS              0x10e0
 #define PCI_DEVICE_ID_IMS_8849         0x8849
 #define PCI_VENDOR_ID_AMCC             0x10e8
 #define PCI_DEVICE_ID_AMCC_MYRINET     0x8043
 #define PCI_DEVICE_ID_AMCC_S5933       0x807d
+#define PCI_DEVICE_ID_AMCC_S5933_HEPC3 0x809c
 
 #define PCI_VENDOR_ID_INTERG           0x10ea
 #define PCI_DEVICE_ID_INTERG_1680      0x1680
 #define PCI_VENDOR_ID_REALTEK          0x10ec
 #define PCI_DEVICE_ID_REALTEK_8029     0x8029
 #define PCI_DEVICE_ID_REALTEK_8129     0x8129
+#define PCI_DEVICE_ID_REALTEK_8139     0x8139
 
 #define PCI_VENDOR_ID_TRUEVISION       0x10fa
 #define PCI_DEVICE_ID_TRUEVISION_T1000 0x000c
 
 #define PCI_VENDOR_ID_INIT             0x1101
 #define PCI_DEVICE_ID_INIT_320P                0x9100
+#define PCI_DEVICE_ID_INIT_360P                0x9500
 
 #define PCI_VENDOR_ID_VIA              0x1106
 #define PCI_DEVICE_ID_VIA_82C505       0x0505
 #define PCI_DEVICE_ID_VIA_82C576       0x0576
 #define PCI_DEVICE_ID_VIA_82C585       0x0585
 #define PCI_DEVICE_ID_VIA_82C586_0     0x0586
+#define PCI_DEVICE_ID_VIA_82C595       0x0595
+#define PCI_DEVICE_ID_VIA_82C597_0     0x0597
 #define PCI_DEVICE_ID_VIA_82C926       0x0926
 #define PCI_DEVICE_ID_VIA_82C416       0x1571
+#define PCI_DEVICE_ID_VIA_82C595_97    0x1595
+#define PCI_DEVICE_ID_VIA_82C586_2     0x3038
+#define PCI_DEVICE_ID_VIA_82C586_3     0x3040
+#define PCI_DEVICE_ID_VIA_86C100A      0x6100
+#define PCI_DEVICE_ID_VIA_82C597_1     0x8597
 
 #define PCI_VENDOR_ID_VORTEX           0x1119
 #define PCI_DEVICE_ID_VORTEX_GDT60x0   0x0000
 #define PCI_DEVICE_ID_VORTEX_GDT6x25   0x000b
 #define PCI_DEVICE_ID_VORTEX_GDT6535   0x000c
 #define PCI_DEVICE_ID_VORTEX_GDT6555   0x000d
+#define PCI_DEVICE_ID_VORTEX_GDT6x17RP 0x0100
+#define PCI_DEVICE_ID_VORTEX_GDT6x27RP 0x0101
+#define PCI_DEVICE_ID_VORTEX_GDT6537RP 0x0102
+#define PCI_DEVICE_ID_VORTEX_GDT6557RP 0x0103
+#define PCI_DEVICE_ID_VORTEX_GDT6x11RP 0x0104
+#define PCI_DEVICE_ID_VORTEX_GDT6x21RP 0x0105
+#define PCI_DEVICE_ID_VORTEX_GDT6x17RP1        0x0110
+#define PCI_DEVICE_ID_VORTEX_GDT6x27RP1        0x0111
+#define PCI_DEVICE_ID_VORTEX_GDT6537RP1        0x0112
+#define PCI_DEVICE_ID_VORTEX_GDT6557RP1        0x0113
+#define PCI_DEVICE_ID_VORTEX_GDT6x11RP1        0x0114
+#define PCI_DEVICE_ID_VORTEX_GDT6x21RP1        0x0115
+#define PCI_DEVICE_ID_VORTEX_GDT6x17RP2        0x0120
+#define PCI_DEVICE_ID_VORTEX_GDT6x27RP2        0x0121
+#define PCI_DEVICE_ID_VORTEX_GDT6537RP2        0x0122
+#define PCI_DEVICE_ID_VORTEX_GDT6557RP2        0x0123
+#define PCI_DEVICE_ID_VORTEX_GDT6x11RP2        0x0124
+#define PCI_DEVICE_ID_VORTEX_GDT6x21RP2        0x0125
 
 #define PCI_VENDOR_ID_EF               0x111a
 #define PCI_DEVICE_ID_EF_ATM_FPGA      0x0000
 #define PCI_VENDOR_ID_PHILIPS          0x1131
 #define PCI_DEVICE_ID_PHILIPS_SAA7146  0x7146
 
-#define PCI_VENDOR_ID_PLX              0x113c
-#define PCI_DEVICE_ID_PLX_9060         0x0001
+#define PCI_VENDOR_ID_CYCLONE          0x113c
+#define PCI_DEVICE_ID_CYCLONE_SDK      0x0001
 
 #define PCI_VENDOR_ID_ALLIANCE         0x1142
 #define PCI_DEVICE_ID_ALLIANCE_PROMOTIO        0x3210
 #define PCI_DEVICE_ID_ALLIANCE_PROVIDEO        0x6422
+#define PCI_DEVICE_ID_ALLIANCE_AT24    0x6424
+#define PCI_DEVICE_ID_ALLIANCE_AT3D    0x643d
 
 #define PCI_VENDOR_ID_VMIC             0x114a
 #define PCI_DEVICE_ID_VMIC_VME         0x7587
 
 #define PCI_VENDOR_ID_DIGI             0x114f
+#define PCI_DEVICE_ID_DIGI_EPC         0x0002
 #define PCI_DEVICE_ID_DIGI_RIGHTSWITCH 0x0003
+#define PCI_DEVICE_ID_DIGI_XEM         0x0004
+#define PCI_DEVICE_ID_DIGI_XR          0x0005
+#define PCI_DEVICE_ID_DIGI_CX          0x0006
+#define PCI_DEVICE_ID_DIGI_XRJ         0x0009
+#define PCI_DEVICE_ID_DIGI_EPCJ                0x000a
+#define PCI_DEVICE_ID_DIGI_XR_920      0x0027
 
 #define PCI_VENDOR_ID_MUTECH           0x1159
 #define PCI_DEVICE_ID_MUTECH_MV1000    0x0001
 
 #define PCI_VENDOR_ID_RENDITION                0x1163
 #define PCI_DEVICE_ID_RENDITION_VERITE 0x0001
+#define PCI_DEVICE_ID_RENDITION_VERITE2100 0x2000
 
 #define PCI_VENDOR_ID_TOSHIBA          0x1179
 #define PCI_DEVICE_ID_TOSHIBA_601      0x0601
+#define PCI_DEVICE_ID_TOSHIBA_TOPIC95  0x060a
+#define PCI_DEVICE_ID_TOSHIBA_TOPIC97  0x060f
 
 #define PCI_VENDOR_ID_RICOH            0x1180
 #define PCI_DEVICE_ID_RICOH_RL5C466    0x0466
 
+#define PCI_VENDOR_ID_ARTOP            0x1191
+#define PCI_DEVICE_ID_ARTOP_ATP850UF   0x0005
+
 #define PCI_VENDOR_ID_ZEITNET          0x1193
 #define PCI_DEVICE_ID_ZEITNET_1221     0x0001
 #define PCI_DEVICE_ID_ZEITNET_1225     0x0002
 #define PCI_VENDOR_ID_OMEGA            0x119b
 #define PCI_DEVICE_ID_OMEGA_82C092G    0x1221
 
+#define PCI_VENDOR_ID_LITEON           0x11ad
+#define PCI_DEVICE_ID_LITEON_LNE100TX  0x0002
+
 #define PCI_VENDOR_ID_NP               0x11bc
 #define PCI_DEVICE_ID_NP_PCI_FDDI      0x0001
 
+#define PCI_VENDOR_ID_ATT              0x11c1
+#define PCI_DEVICE_ID_ATT_L56XMF       0x0440
+
 #define PCI_VENDOR_ID_SPECIALIX                0x11cb
 #define PCI_DEVICE_ID_SPECIALIX_XIO    0x4000
 #define PCI_DEVICE_ID_SPECIALIX_RIO    0x8000
 
+#define PCI_VENDOR_ID_AURAVISION       0x11d1
+#define PCI_DEVICE_ID_AURAVISION_VXP524        0x01f7
+
 #define PCI_VENDOR_ID_IKON             0x11d5
 #define PCI_DEVICE_ID_IKON_10115       0x0115
 #define PCI_DEVICE_ID_IKON_10117       0x0117
 #define PCI_DEVICE_ID_ZORAN_36057      0x6057
 #define PCI_DEVICE_ID_ZORAN_36120      0x6120
 
+#define PCI_VENDOR_ID_KINETIC          0x11f4
+#define PCI_DEVICE_ID_KINETIC_2915     0x2915
+
 #define PCI_VENDOR_ID_COMPEX           0x11f6
 #define PCI_DEVICE_ID_COMPEX_ENET100VG4        0x0112
 #define PCI_DEVICE_ID_COMPEX_RL2000    0x1401
 #define PCI_DEVICE_ID_CYCLOM_Z_Lo      0x0200
 #define PCI_DEVICE_ID_CYCLOM_Z_Hi      0x0201
 
+#define PCI_VENDOR_ID_ESSENTIAL                0x120f
+#define PCI_DEVICE_ID_ESSENTIAL_ROADRUNNER     0x0001
+
+#define PCI_VENDOR_ID_O2               0x1217
+#define PCI_DEVICE_ID_O2_6832          0x6832
+
 #define PCI_VENDOR_ID_3DFX             0x121a
 #define PCI_DEVICE_ID_3DFX_VOODOO      0x0001
+#define PCI_DEVICE_ID_3DFX_VOODOO2     0x0002
 
 #define PCI_VENDOR_ID_SIGMADES         0x1236
 #define PCI_DEVICE_ID_SIGMADES_6425    0x6401
 
+#define PCI_VENDOR_ID_CCUBE            0x123f
+
+#define PCI_VENDOR_ID_DIPIX            0x1246
+
+#define PCI_VENDOR_ID_STALLION         0x124d
+#define PCI_DEVICE_ID_STALLION_ECHPCI832 0x0000
+#define PCI_DEVICE_ID_STALLION_ECHPCI864 0x0002
+#define PCI_DEVICE_ID_STALLION_EIOPCI  0x0003
+
 #define PCI_VENDOR_ID_OPTIBASE         0x1255
 #define PCI_DEVICE_ID_OPTIBASE_FORGE   0x1110
 #define PCI_DEVICE_ID_OPTIBASE_FUSION  0x1210
 #define PCI_DEVICE_ID_OPTIBASE_VPLEXCC 0x2120
 #define PCI_DEVICE_ID_OPTIBASE_VQUEST  0x2130
 
+#define PCI_VENDOR_ID_SATSAGEM         0x1267
+#define PCI_DEVICE_ID_SATSAGEM_PCR2101 0x5352
+#define PCI_DEVICE_ID_SATSAGEM_TELSATTURBO 0x5a4b
+
+#define PCI_VENDOR_ID_ENSONIQ          0x1274
+#define PCI_DEVICE_ID_ENSONIQ_AUDIOPCI 0x5000
+
+#define PCI_VENDOR_ID_PICTUREL         0x12c5
+#define PCI_DEVICE_ID_PICTUREL_PCIVST  0x0081
+
+#define PCI_VENDOR_ID_NVIDIA_SGS       0x12d2
+#define PCI_DEVICE_ID_NVIDIA_SGS_RIVA128 0x0018
+
+#define PCI_VENDOR_ID_CBOARDS          0x1307
+#define PCI_DEVICE_ID_CBOARDS_DAS1602_16 0x0001
+
 #define PCI_VENDOR_ID_SYMPHONY         0x1c1c
 #define PCI_DEVICE_ID_SYMPHONY_101     0x0001
 
 #define PCI_DEVICE_ID_3DLABS_500TX     0x0002
 #define PCI_DEVICE_ID_3DLABS_DELTA     0x0003
 #define PCI_DEVICE_ID_3DLABS_PERMEDIA  0x0004
+#define PCI_DEVICE_ID_3DLABS_MX                0x0006
 
 #define PCI_VENDOR_ID_AVANCE           0x4005
 #define PCI_DEVICE_ID_AVANCE_ALG2064   0x2064
 #define PCI_DEVICE_ID_S3_PLATO_PXG     0x8902
 #define PCI_DEVICE_ID_S3_ViRGE_DXGX    0x8a01
 #define PCI_DEVICE_ID_S3_ViRGE_GX2     0x8a10
+#define PCI_DEVICE_ID_S3_ViRGE_MX      0x8c01
+#define PCI_DEVICE_ID_S3_ViRGE_MXP     0x8c02
+#define PCI_DEVICE_ID_S3_ViRGE_MXPMV   0x8c03
+#define PCI_DEVICE_ID_S3_SONICVIBES    0xca00
 
 #define PCI_VENDOR_ID_INTEL            0x8086
 #define PCI_DEVICE_ID_INTEL_82375      0x0482
 #define PCI_DEVICE_ID_INTEL_82371MX    0x1234
 #define PCI_DEVICE_ID_INTEL_82437MX    0x1235
 #define PCI_DEVICE_ID_INTEL_82441      0x1237
+#define PCI_DEVICE_ID_INTEL_82380FB    0x124b
 #define PCI_DEVICE_ID_INTEL_82439      0x1250
 #define PCI_DEVICE_ID_INTEL_82371SB_0  0x7000
 #define PCI_DEVICE_ID_INTEL_82371SB_1  0x7010
 #define PCI_DEVICE_ID_INTEL_82371AB    0x7111
 #define PCI_DEVICE_ID_INTEL_82371AB_2  0x7112
 #define PCI_DEVICE_ID_INTEL_82371AB_3  0x7113
+#define PCI_DEVICE_ID_INTEL_82443LX_0  0x7180
+#define PCI_DEVICE_ID_INTEL_82443LX_1  0x7181
+#define PCI_DEVICE_ID_INTEL_82443BX_0  0x7190
+#define PCI_DEVICE_ID_INTEL_82443BX_1  0x7191
+#define PCI_DEVICE_ID_INTEL_82443BX_2  0x7192
 #define PCI_DEVICE_ID_INTEL_P6         0x84c4
 #define PCI_DEVICE_ID_INTEL_82450GX    0x84c5
 
 #define PCI_DEVICE_ID_ADAPTEC_7810     0x1078
 #define PCI_DEVICE_ID_ADAPTEC_7850     0x5078
 #define PCI_DEVICE_ID_ADAPTEC_7855     0x5578
+#define PCI_DEVICE_ID_ADAPTEC_5800     0x5800
 #define PCI_DEVICE_ID_ADAPTEC_7860     0x6078
 #define PCI_DEVICE_ID_ADAPTEC_7861     0x6178
 #define PCI_DEVICE_ID_ADAPTEC_7870     0x7078
 #define PCI_DEVICE_ID_ADAPTEC_7882     0x8278
 #define PCI_DEVICE_ID_ADAPTEC_7883     0x8378
 #define PCI_DEVICE_ID_ADAPTEC_7884     0x8478
+#define PCI_DEVICE_ID_ADAPTEC_1030     0x8b78
 
 #define PCI_VENDOR_ID_ATRONICS         0x907f
 #define PCI_DEVICE_ID_ATRONICS_2015    0x2015
 
+#define PCI_VENDOR_ID_HOLTEK           0x9412
+#define PCI_DEVICE_ID_HOLTEK_6565      0x6565
+
+#define PCI_VENDOR_ID_TIGERJET         0xe159
+#define PCI_DEVICE_ID_TIGERJET_300     0x0001
+
 #define PCI_VENDOR_ID_ARK              0xedd8
 #define PCI_DEVICE_ID_ARK_STING                0xa091
 #define PCI_DEVICE_ID_ARK_STINGARK     0xa099
index 71351f6e3493241522abeafd930ab1f6676b15d9..529b3215525d0dbe9fed5c2ebec4f962d29cc5fb 100644 (file)
@@ -375,7 +375,7 @@ static struct sk_buff *ip_glue(struct ipq *qp)
        fp = qp->fragments;
        while(fp != NULL)
        {
-               if (fp->len < 0 || count+fp->len > skb->len)
+               if (fp->len < 0 || fp->offset+qp->ihlen+fp->len > skb->len)
                {
                        NETDEBUG(printk("Invalid fragment list: Fragment over size.\n"));
                        ip_free(qp);
@@ -489,7 +489,7 @@ struct sk_buff *ip_defrag(struct iphdr *iph, struct sk_buff *skb, struct device
        if(ntohs(iph->tot_len)+(int)offset>65535)
        {
                skb->sk = NULL;
-               printk("Oversized packet received from %s\n",in_ntoa(iph->saddr));
+               NETDEBUG(printk("Oversized packet received from %s\n",in_ntoa(iph->saddr)));
                kfree_skb(skb, FREE_READ);
                ip_statistics.IpReasmFails++;
                return NULL;
index b0544a052fe1fcda6725de85bfd1d801eef058d0..dca2a3dd95044dc31cb4b073ea4fc9a6a7174e5b 100644 (file)
@@ -29,6 +29,7 @@
  *             as published by the Free Software Foundation; either version
  *             2 of the License, or (at your option) any later version.
  */
+#include <linux/config.h>
 #include <asm/system.h>
 #include <linux/sched.h>
 #include <linux/socket.h>