[PATCH 1/1] net: add killer E2500 device id

[PATCH 1/1] net: add killer E2500 device id

[Owen Lin]

Add Killer E2500 device ID in alx driver.

Signed-off-by: Owen Lin olin@rivetnetworks.com

--------------------------------------------------------------------------------

diff -up1rN alx_orig/main.c alx/main.c
--- alx_orig/main.c	2016-08-25 11:12:34.170447500 +0800
+++ alx/main.c	2016-08-25 11:24:12.026853000 +0800
@@ -1547,2 +1547,4 @@ static const struct pci_device_id alx_pc
 	  .driver_data = ALX_DEV_QUIRK_MSI_INTX_DISABLE_BUG },
+	{ PCI_VDEVICE(ATTANSIC, ALX_DEV_ID_E2500),
+	  .driver_data = ALX_DEV_QUIRK_MSI_INTX_DISABLE_BUG },
 	{ PCI_VDEVICE(ATTANSIC, ALX_DEV_ID_AR8162),
diff -up1rN alx_orig/reg.h alx/reg.h
--- alx_orig/reg.h	2016-08-25 11:08:25.895534000 +0800
+++ alx/reg.h	2016-08-25 11:24:34.933147000 +0800
@@ -40,5 +40,6 @@
 #define ALX_DEV_ID_E2400				0xe0a1
+#define ALX_DEV_ID_E2500				0xe0b1
 #define ALX_DEV_ID_AR8162				0x1090
-#define ALX_DEV_ID_AR8171				0x10A1
-#define ALX_DEV_ID_AR8172				0x10A0
+#define ALX_DEV_ID_AR8171				0x10a1
+#define ALX_DEV_ID_AR8172				0x10a0

/* rev definition,

Re: [PATCH 1/1] net: add killer E2500 device id

[Sabrina Dubroca]

Hi Owen,

2016-08-25, 03:33:11 +0000, Owen Lin wrote:
> Add Killer E2500 device ID in alx driver.
> 
> Signed-off-by: Owen Lin olin@rivetnetworks.com
> 
> --------------------------------------------------------------------------------

This line shouldn't be here (it will end up in the commit message).


> diff -up1rN alx_orig/main.c alx/main.c
> --- alx_orig/main.c	2016-08-25 11:12:34.170447500 +0800
> +++ alx/main.c	2016-08-25 11:24:12.026853000 +0800

That patch won't apply.  The patch should be generated from the root
directory, and include the full path of the files you're modifying, so
that the patch can be applied from the root directory of the kernel
tree.  i.e. the paths should be of the form

    a/drivers/net/ethernet/atheros/alx/main.c

The easiest way to create patches that apply properly is to use the
git tree and the `git format-patch` tool.


Thanks,

-- 
Sabrina

Re: [PATCH 1/1] net: add killer E2500 device id

[David Miller]

From: Owen Lin <olin@rivetnetworks.com>
Date: Fri, 26 Aug 2016 05:55:45 +0000

> From 5a40989933c7dcd904bebd3c64eaf84445fad1fd Mon Sep 17 00:00:00 2001
> From: Owen Lin <olin@rivetnetworks.com>
> Date: Fri, 26 Aug 2016 13:49:09 +0800
> Subject: [PATCH] Add Killer E2500 device ID in alx driver.

Applied, thanks.

[PATCH 1/1] net: add killer E2500 device id

[Owen Lin]

>From 5a40989933c7dcd904bebd3c64eaf84445fad1fd Mon Sep 17 00:00:00 2001
From: Owen Lin <olin@rivetnetworks.com>
Date: Fri, 26 Aug 2016 13:49:09 +0800
Subject: [PATCH] Add Killer E2500 device ID in alx driver.

---
 drivers/net/ethernet/atheros/alx/main.c | 2 ++
 drivers/net/ethernet/atheros/alx/reg.h  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
index 6453148..4eb17da 100644
--- a/drivers/net/ethernet/atheros/alx/main.c
+++ b/drivers/net/ethernet/atheros/alx/main.c
@@ -1545,6 +1545,8 @@ static const struct pci_device_id alx_pci_tbl[] = {
 	  .driver_data = ALX_DEV_QUIRK_MSI_INTX_DISABLE_BUG },
 	{ PCI_VDEVICE(ATTANSIC, ALX_DEV_ID_E2400),
 	  .driver_data = ALX_DEV_QUIRK_MSI_INTX_DISABLE_BUG },
+	{ PCI_VDEVICE(ATTANSIC, ALX_DEV_ID_E2500),
+	  .driver_data = ALX_DEV_QUIRK_MSI_INTX_DISABLE_BUG },
 	{ PCI_VDEVICE(ATTANSIC, ALX_DEV_ID_AR8162),
 	  .driver_data = ALX_DEV_QUIRK_MSI_INTX_DISABLE_BUG },
 	{ PCI_VDEVICE(ATTANSIC, ALX_DEV_ID_AR8171) },
diff --git a/drivers/net/ethernet/atheros/alx/reg.h b/drivers/net/ethernet/atheros/alx/reg.h
index 0959e68..1fc2d85 100644
--- a/drivers/net/ethernet/atheros/alx/reg.h
+++ b/drivers/net/ethernet/atheros/alx/reg.h
@@ -38,6 +38,7 @@
 #define ALX_DEV_ID_AR8161				0x1091
 #define ALX_DEV_ID_E2200				0xe091
 #define ALX_DEV_ID_E2400				0xe0a1
+#define ALX_DEV_ID_E2500				0xe0b1
 #define ALX_DEV_ID_AR8162				0x1090
 #define ALX_DEV_ID_AR8171				0x10A1
 #define ALX_DEV_ID_AR8172				0x10A0