summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/0007-pci_dev_dev_flags/alx.patch
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-06-27 18:35:55 +0000
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-07-01 13:39:11 -0700
commitafe18ac2454e8ba8c3a45a837da7c7fca65c5aae (patch)
tree4c6922e03967d591f9d40b20ac5c0d987921528c /patches/collateral-evolutions/network/0007-pci_dev_dev_flags/alx.patch
parente3220f58fc08f986c3b84458d50eee2d3b983690 (diff)
backports: add new alx upstream backport
This backports the new upstream alx driver and properly splits up each required backports into its respective collateral evolution bucket. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/network/0007-pci_dev_dev_flags/alx.patch')
-rw-r--r--patches/collateral-evolutions/network/0007-pci_dev_dev_flags/alx.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/patches/collateral-evolutions/network/0007-pci_dev_dev_flags/alx.patch b/patches/collateral-evolutions/network/0007-pci_dev_dev_flags/alx.patch
new file mode 100644
index 00000000..aa782b76
--- /dev/null
+++ b/patches/collateral-evolutions/network/0007-pci_dev_dev_flags/alx.patch
@@ -0,0 +1,13 @@
+--- a/drivers/net/ethernet/atheros/alx/main.c
++++ b/drivers/net/ethernet/atheros/alx/main.c
+@@ -1322,8 +1322,10 @@ static int alx_probe(struct pci_dev *pde
+ netdev->irq = pdev->irq;
+ netdev->watchdog_timeo = ALX_WATCHDOG_TIME;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
+ if (ent->driver_data & ALX_DEV_QUIRK_MSI_INTX_DISABLE_BUG)
+ pdev->dev_flags |= PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG;
++#endif
+
+ err = alx_init_sw(alx);
+ if (err) {