Home Home > GIT Browse
summaryrefslogtreecommitdiff
authorBrandon Philips <bphilips@suse.de>2010-11-05 15:34:37 (GMT)
committer Brandon Philips <bphilips@suse.de>2010-11-05 15:34:37 (GMT)
commit43925bf6aeeba3318cd022bfc39e0b587af39836 (patch) (side-by-side diff)
tree29a23e6695d9b57152ba36a8c37dc7e60ec1b920
parent43d6b9d04960d3aa5fe8f587b108d9a1d4d1f333 (diff)
- patches.drivers/mlx4_core-Add-40GigE-device-ID.patch: mlx4_core:rpm-2.6.16.60-0.75
Add 40GigE device ID (bnc#643671, fate#309936). - patches.drivers/mlx4_core-Add-a-new-supported-40-GigE-device-ID.patch: mlx4_core: Add a new supported 40 GigE device ID (bnc#643671, fate#309936).
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kernel-source.changes9
-rw-r--r--patches.drivers/mlx4_core-Add-40GigE-device-ID.patch25
-rw-r--r--patches.drivers/mlx4_core-Add-a-new-supported-40-GigE-device-ID.patch27
-rw-r--r--series.conf4
4 files changed, 64 insertions, 1 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 9c74558..eb90c6f 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Fri Nov 5 16:34:29 CET 2010 - bphilips@suse.de
+
+- patches.drivers/mlx4_core-Add-40GigE-device-ID.patch: mlx4_core:
+ Add 40GigE device ID (bnc#643671, fate#309936).
+- patches.drivers/mlx4_core-Add-a-new-supported-40-GigE-device-ID.patch:
+ mlx4_core: Add a new supported 40 GigE device ID (bnc#643671,
+ fate#309936).
+
+-------------------------------------------------------------------
Fri Nov 5 16:19:54 CET 2010 - bphilips@suse.de
- patches.drivers/be2net-patch-to-perform-function-reset-at.patch:
diff --git a/patches.drivers/mlx4_core-Add-40GigE-device-ID.patch b/patches.drivers/mlx4_core-Add-40GigE-device-ID.patch
new file mode 100644
index 0000000..3a33f1f
--- a/dev/null
+++ b/patches.drivers/mlx4_core-Add-40GigE-device-ID.patch
@@ -0,0 +1,25 @@
+From Mon Sep 17 00:00:00 2001
+From: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
+Date: Wed, 7 Oct 2009 15:46:49 -0700
+Subject: [PATCH] mlx4_core: Add 40GigE device ID
+Git-commit: e76d0b67d022fe70def07cfff3cdb36138b4c3f2
+Patch-mainline: 2.6.32
+References: bnc#643671, fate#309936
+
+Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
+Signed-off-by: Roland Dreier <rolandd@cisco.com>
+Signed-off-by: Brandon Philips <bphilips@suse.de>
+---
+ drivers/net/mlx4/main.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/mlx4/main.c
++++ b/drivers/net/mlx4/main.c
+@@ -1454,6 +1454,7 @@ static struct pci_device_id mlx4_pci_tab
+ { PCI_VDEVICE(MELLANOX, 0x6372) }, /* MT25408 "YATIR" EN 10GigE */
+ { PCI_VDEVICE(MELLANOX, 0x675a) }, /* MT25408 "YATIR" EN 10GigE + Gen2 */
+ { PCI_VDEVICE(MELLANOX, 0x6764) }, /* MT26468 "ConnectX 10GigE, PCIe, 2.0 5Gt/s] */
++ { PCI_VDEVICE(MELLANOX, 0x676e) }, /* MT26478 ConnectX2 40GigE PCIe gen2 */
+ { 0, }
+ };
+
diff --git a/patches.drivers/mlx4_core-Add-a-new-supported-40-GigE-device-ID.patch b/patches.drivers/mlx4_core-Add-a-new-supported-40-GigE-device-ID.patch
new file mode 100644
index 0000000..8de3917
--- a/dev/null
+++ b/patches.drivers/mlx4_core-Add-a-new-supported-40-GigE-device-ID.patch
@@ -0,0 +1,27 @@
+From: Eli Cohen <eli@mellanox.co.il>
+Date: Wed, 14 Oct 2009 10:52:40 -0700
+Subject: [PATCH] mlx4_core: Add a new supported 40 GigE device ID
+Patch-mainline: v2.6.32-rc6~38^2
+Git-commit: 06c3aa5ef1c9491f4c94483ca52afc420bc58c5a
+References: bnc#643671, fate#309936
+
+Add MT26438 (ConnectX EN 40GigE PCIe 2.0 5GT/s) to the list of supported
+devices.
+
+Signed-off-by: Eli Cohen <eli@mellanox.co.il>
+Signed-off-by: Roland Dreier <rolandd@cisco.com>
+Signed-off-by: Brandon Philips <bphilips@suse.de>
+---
+ drivers/net/mlx4/main.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/mlx4/main.c
++++ b/drivers/net/mlx4/main.c
+@@ -1454,6 +1454,7 @@ static struct pci_device_id mlx4_pci_tab
+ { PCI_VDEVICE(MELLANOX, 0x6372) }, /* MT25408 "YATIR" EN 10GigE */
+ { PCI_VDEVICE(MELLANOX, 0x675a) }, /* MT25408 "YATIR" EN 10GigE + Gen2 */
+ { PCI_VDEVICE(MELLANOX, 0x6764) }, /* MT26468 "ConnectX 10GigE, PCIe, 2.0 5Gt/s] */
++ { PCI_VDEVICE(MELLANOX, 0x6746) }, /* MT26438 ConnectX EN 40GigE PCIe gen2 5GT/s */
+ { PCI_VDEVICE(MELLANOX, 0x676e) }, /* MT26478 ConnectX2 40GigE PCIe gen2 */
+ { 0, }
+ };
diff --git a/series.conf b/series.conf
index d277358..ba9a816 100644
--- a/series.conf
+++ b/series.conf
@@ -2724,7 +2724,9 @@
patches.drivers/mlx4-map-sufficient-icm-memory-for-eqs.patch
patches.drivers/mlx4-fix-vlan-flag-endianess-in-lro-code.patch
patches.drivers/mlx4_core-Allocate-and-map-sufficient-ICM-memory-for-EQ-context.patch
-
+ patches.drivers/mlx4_core-Add-40GigE-device-ID.patch
+ patches.drivers/mlx4_core-Add-a-new-supported-40-GigE-device-ID.patch
+
patches.drivers/brocade-bna.patch
patches.drivers/brocade-bna-beta2.patch
patches.drivers/brocade-bna-2.3.2.1.patch