Просмотр исходного кода

E1000: Add support for the 82541GI LF Intel Pro 1000 GT Desktop Adapter

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Wolfgang Grandegger 17 лет назад
Родитель
Сommit
aa3b8bf9c3
3 измененных файлов с 6 добавлено и 2 удалено
  1. 2 0
      drivers/net/e1000.c
  2. 2 1
      drivers/net/e1000.h
  3. 2 1
      include/pci_ids.h

+ 2 - 0
drivers/net/e1000.c

@@ -83,6 +83,7 @@ static struct pci_device_id supported[] = {
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82546EB_FIBER},
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82546EB_FIBER},
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82540EM_LOM},
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82540EM_LOM},
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82541ER},
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82541ER},
+	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82541GI_LF},
 };
 };
 
 
 /* Function forward declarations */
 /* Function forward declarations */
@@ -646,6 +647,7 @@ e1000_set_mac_type(struct e1000_hw *hw)
 		hw->mac_type = e1000_82546;
 		hw->mac_type = e1000_82546;
 		break;
 		break;
 	case E1000_DEV_ID_82541ER:
 	case E1000_DEV_ID_82541ER:
+	case E1000_DEV_ID_82541GI_LF:
 		hw->mac_type = e1000_82541_rev_2;
 		hw->mac_type = e1000_82541_rev_2;
 		break;
 		break;
 	default:
 	default:

+ 2 - 1
drivers/net/e1000.h

@@ -222,7 +222,8 @@ struct e1000_phy_stats {
 #define E1000_DEV_ID_82546EB_COPPER 0x1010
 #define E1000_DEV_ID_82546EB_COPPER 0x1010
 #define E1000_DEV_ID_82546EB_FIBER  0x1012
 #define E1000_DEV_ID_82546EB_FIBER  0x1012
 #define E1000_DEV_ID_82541ER	    0x1078
 #define E1000_DEV_ID_82541ER	    0x1078
-#define NUM_DEV_IDS 14
+#define E1000_DEV_ID_82541GI_LF	    0x107C
+#define NUM_DEV_IDS 15
 
 
 #define NODE_ADDRESS_SIZE 6
 #define NODE_ADDRESS_SIZE 6
 #define ETH_LENGTH_OF_ADDRESS 6
 #define ETH_LENGTH_OF_ADDRESS 6

+ 2 - 1
include/pci_ids.h

@@ -1812,7 +1812,8 @@
 #define PCI_DEVICE_ID_INTEL_82434	0x04a3
 #define PCI_DEVICE_ID_INTEL_82434	0x04a3
 #define PCI_DEVICE_ID_INTEL_I960	0x0960
 #define PCI_DEVICE_ID_INTEL_I960	0x0960
 #define PCI_DEVICE_ID_INTEL_I960RM	0x0962
 #define PCI_DEVICE_ID_INTEL_I960RM	0x0962
-#define PCI_DEVICE_ID_INTEL_82541ER 0x1078
+#define PCI_DEVICE_ID_INTEL_82541ER	0x1078
+#define PCI_DEVICE_ID_INTEL_82541GI_LF	0x107c
 #define PCI_DEVICE_ID_INTEL_82542	0x1000
 #define PCI_DEVICE_ID_INTEL_82542	0x1000
 #define PCI_DEVICE_ID_INTEL_82543GC_FIBER	0x1001
 #define PCI_DEVICE_ID_INTEL_82543GC_FIBER	0x1001
 #define PCI_DEVICE_ID_INTEL_82543GC_COPPER	0x1004
 #define PCI_DEVICE_ID_INTEL_82543GC_COPPER	0x1004