]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
projects / thirdparty / kernel / stable-queue.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 415adfe)
3.0-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 30 Nov 2012 01:19:26 +0000 (17:19 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 30 Nov 2012 01:19:26 +0000 (17:19 -0800)
added patches:
get_dvb_firmware-fix-download-site-for-tda10046-firmware.patch
ixgbe-add-support-for-new-82599-device-id.patch
ixgbe-add-support-for-new-82599-device.patch

queue-3.0/get_dvb_firmware-fix-download-site-for-tda10046-firmware.patch [new file with mode: 0644] patch | blob
queue-3.0/ixgbe-add-support-for-new-82599-device-id.patch [new file with mode: 0644] patch | blob
queue-3.0/ixgbe-add-support-for-new-82599-device.patch [new file with mode: 0644] patch | blob
queue-3.0/series patch | blob | blame | history

diff --git a/queue-3.0/get_dvb_firmware-fix-download-site-for-tda10046-firmware.patch b/queue-3.0/get_dvb_firmware-fix-download-site-for-tda10046-firmware.patch
new file mode 100644 (file)
index 0000000..5972009
--- /dev/null
+++ b/queue-3.0/get_dvb_firmware-fix-download-site-for-tda10046-firmware.patch
@@ -0,0 +1,31 @@
+From 25ec43d3e6306978cf66060ed18c4160ce8fc302 Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab@redhat.com>
+Date: Fri, 28 Sep 2012 16:16:00 -0300
+Subject: get_dvb_firmware: fix download site for tda10046 firmware
+
+From: Mauro Carvalho Chehab <mchehab@redhat.com>
+
+commit 25ec43d3e6306978cf66060ed18c4160ce8fc302 upstream.
+
+The previous website doesn't exist anymore. Update it to one site that
+actually exists.
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ Documentation/dvb/get_dvb_firmware |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Documentation/dvb/get_dvb_firmware
++++ b/Documentation/dvb/get_dvb_firmware
+@@ -114,7 +114,7 @@ sub tda10045 {
+ 
+ sub tda10046 {
+       my $sourcefile = "TT_PCI_2.19h_28_11_2006.zip";
+-      my $url = "http://www.tt-download.com/download/updates/219/$sourcefile";
++      my $url = "http://technotrend.com.ua/download/software/219/$sourcefile";
+       my $hash = "6a7e1e2f2644b162ff0502367553c72d";
+       my $outfile = "dvb-fe-tda10046.fw";
+       my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);
diff --git a/queue-3.0/ixgbe-add-support-for-new-82599-device-id.patch b/queue-3.0/ixgbe-add-support-for-new-82599-device-id.patch
new file mode 100644 (file)
index 0000000..9695de0
--- /dev/null
+++ b/queue-3.0/ixgbe-add-support-for-new-82599-device-id.patch
@@ -0,0 +1,54 @@
+From 9e791e4a04c08868f02cd579a428a7268492e1b4 Mon Sep 17 00:00:00 2001
+From: Emil Tantilov <emil.s.tantilov@intel.com>
+Date: Fri, 4 Nov 2011 06:43:29 +0000
+Subject: ixgbe: add support for new 82599 device id
+
+From: Emil Tantilov <emil.s.tantilov@intel.com>
+
+commit 9e791e4a04c08868f02cd579a428a7268492e1b4 upstream.
+
+Support for new 82599 based quad port adapter.
+
+Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
+Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Signed-off-by: Abdallah Chatila <Abdallah.Chatila@ericsson.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/ixgbe/ixgbe_82599.c |    1 +
+ drivers/net/ixgbe/ixgbe_main.c  |    2 ++
+ drivers/net/ixgbe/ixgbe_type.h  |    1 +
+ 3 files changed, 4 insertions(+)
+
+--- a/drivers/net/ixgbe/ixgbe_82599.c
++++ b/drivers/net/ixgbe/ixgbe_82599.c
+@@ -361,6 +361,7 @@ static enum ixgbe_media_type ixgbe_get_m
+       case IXGBE_DEV_ID_82599_SFP_EM:
+       case IXGBE_DEV_ID_82599_SFP_SF2:
+       case IXGBE_DEV_ID_82599EN_SFP:
++      case IXGBE_DEV_ID_82599_SFP_SF_QP:
+               media_type = ixgbe_media_type_fiber;
+               break;
+       case IXGBE_DEV_ID_82599_CX4:
+--- a/drivers/net/ixgbe/ixgbe_main.c
++++ b/drivers/net/ixgbe/ixgbe_main.c
+@@ -131,6 +131,8 @@ static DEFINE_PCI_DEVICE_TABLE(ixgbe_pci
+        board_82599 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599EN_SFP),
+        board_82599 },
++      {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF_QP),
++       board_82599 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540T1),
+        board_X540 },
+ 
+--- a/drivers/net/ixgbe/ixgbe_type.h
++++ b/drivers/net/ixgbe/ixgbe_type.h
+@@ -64,6 +64,7 @@
+ #define IXGBE_DEV_ID_82599_COMBO_BACKPLANE 0x10F8
+ #define IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ  0x000C
+ #define IXGBE_DEV_ID_82599_LS            0x154F
++#define IXGBE_DEV_ID_82599_SFP_SF_QP     0x154A
+ #define IXGBE_DEV_ID_X540T               0x1528
+ #define IXGBE_DEV_ID_X540T1              0x1560
+ 
diff --git a/queue-3.0/ixgbe-add-support-for-new-82599-device.patch b/queue-3.0/ixgbe-add-support-for-new-82599-device.patch
new file mode 100644 (file)
index 0000000..523765c
--- /dev/null
+++ b/queue-3.0/ixgbe-add-support-for-new-82599-device.patch
@@ -0,0 +1,54 @@
+From 7d145282da8d1ae4ba5f7ead8a4f51183496803c Mon Sep 17 00:00:00 2001
+From: Emil Tantilov <emil.s.tantilov@intel.com>
+Date: Thu, 8 Sep 2011 08:30:14 +0000
+Subject: ixgbe: add support for new 82599 device
+
+From: Emil Tantilov <emil.s.tantilov@intel.com>
+
+commit 7d145282da8d1ae4ba5f7ead8a4f51183496803c upstream.
+
+This patch adds support for new device ID.
+
+Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
+Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Signed-off-by: Abdallah Chatila <Abdallah.Chatila@ericsson.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/ixgbe/ixgbe_82599.c |    1 +
+ drivers/net/ixgbe/ixgbe_main.c  |    2 ++
+ drivers/net/ixgbe/ixgbe_type.h  |    1 +
+ 3 files changed, 4 insertions(+)
+
+--- a/drivers/net/ixgbe/ixgbe_82599.c
++++ b/drivers/net/ixgbe/ixgbe_82599.c
+@@ -360,6 +360,7 @@ static enum ixgbe_media_type ixgbe_get_m
+       case IXGBE_DEV_ID_82599_SFP_FCOE:
+       case IXGBE_DEV_ID_82599_SFP_EM:
+       case IXGBE_DEV_ID_82599_SFP_SF2:
++      case IXGBE_DEV_ID_82599EN_SFP:
+               media_type = ixgbe_media_type_fiber;
+               break;
+       case IXGBE_DEV_ID_82599_CX4:
+--- a/drivers/net/ixgbe/ixgbe_main.c
++++ b/drivers/net/ixgbe/ixgbe_main.c
+@@ -129,6 +129,8 @@ static DEFINE_PCI_DEVICE_TABLE(ixgbe_pci
+        board_82599 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_LS),
+        board_82599 },
++      {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599EN_SFP),
++       board_82599 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540T1),
+        board_X540 },
+ 
+--- a/drivers/net/ixgbe/ixgbe_type.h
++++ b/drivers/net/ixgbe/ixgbe_type.h
+@@ -59,6 +59,7 @@
+ #define IXGBE_SUBDEV_ID_82599_SFP        0x11A9
+ #define IXGBE_DEV_ID_82599_SFP_EM        0x1507
+ #define IXGBE_DEV_ID_82599_SFP_SF2       0x154D
++#define IXGBE_DEV_ID_82599EN_SFP         0x1557
+ #define IXGBE_DEV_ID_82599_XAUI_LOM      0x10FC
+ #define IXGBE_DEV_ID_82599_COMBO_BACKPLANE 0x10F8
+ #define IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ  0x000C
diff --git a/queue-3.0/series b/queue-3.0/series
index f1d1f805c47d4d35aa97847159bf9f59f5f30e05..6cfcbbf1c869cea4600dfae122265639ef147292 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -26,3 +26,6 @@ alsa-hda-add-support-for-realtek-alc292.patch
 bas_gigaset-fix-pre_reset-handling.patch
 ixgbe-add-support-for-x540-at1.patch
 sata_svw-check-dma-start-bit-before-reset.patch
+ixgbe-add-support-for-new-82599-device.patch
+ixgbe-add-support-for-new-82599-device-id.patch
+get_dvb_firmware-fix-download-site-for-tda10046-firmware.patch
Mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git