Merge pull request #35 from johnv-valve/brewmaster-4.1

Add Killer E2400 ID in alx driver
ValveSoftware · Nov 25, 2015 · 941c856 · 941c856
2 parents 7d6f250 + af203d6
commit 941c856
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
@@ -1537,6 +1537,7 @@ static const struct pci_device_id alx_pci_tbl[] = {
 	{ PCI_VDEVICE(ATTANSIC, ALX_DEV_ID_AR8162),
 	  .driver_data = ALX_DEV_QUIRK_MSI_INTX_DISABLE_BUG },
 	{ PCI_VDEVICE(ATTANSIC, ALX_DEV_ID_AR8171) },
+	{ PCI_VDEVICE(ATTANSIC, ALX_DEV_ID_E2400) },
 	{ PCI_VDEVICE(ATTANSIC, ALX_DEV_ID_AR8172) },
 	{}
 };

diff --git a/drivers/net/ethernet/atheros/alx/reg.h b/drivers/net/ethernet/atheros/alx/reg.h
@@ -39,6 +39,7 @@
 #define ALX_DEV_ID_E2200				0xe091
 #define ALX_DEV_ID_AR8162				0x1090
 #define ALX_DEV_ID_AR8171				0x10A1
+#define ALX_DEV_ID_E2400				0xe0A1
 #define ALX_DEV_ID_AR8172				0x10A0
 
 /* rev definition,