From: Greg Kroah-Hartman Date: Fri, 30 Nov 2012 01:19:26 +0000 (-0800) Subject: 3.0-stable patches X-Git-Tag: v3.6.9~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=47dc1768f6171e5d84d9307df2cbae412e028afe;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches 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 --- 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 index 00000000000..5972009ea12 --- /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 +Date: Fri, 28 Sep 2012 16:16:00 -0300 +Subject: get_dvb_firmware: fix download site for tda10046 firmware + +From: Mauro Carvalho Chehab + +commit 25ec43d3e6306978cf66060ed18c4160ce8fc302 upstream. + +The previous website doesn't exist anymore. Update it to one site that +actually exists. + +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Peter Huewe +Signed-off-by: Greg Kroah-Hartman + +--- + 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 index 00000000000..9695de085a9 --- /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 +Date: Fri, 4 Nov 2011 06:43:29 +0000 +Subject: ixgbe: add support for new 82599 device id + +From: Emil Tantilov + +commit 9e791e4a04c08868f02cd579a428a7268492e1b4 upstream. + +Support for new 82599 based quad port adapter. + +Signed-off-by: Emil Tantilov +Tested-by: Phil Schmitt +Signed-off-by: Jeff Kirsher +Signed-off-by: Abdallah Chatila +Signed-off-by: Greg Kroah-Hartman + +--- + 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 index 00000000000..523765c5213 --- /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 +Date: Thu, 8 Sep 2011 08:30:14 +0000 +Subject: ixgbe: add support for new 82599 device + +From: Emil Tantilov + +commit 7d145282da8d1ae4ba5f7ead8a4f51183496803c upstream. + +This patch adds support for new device ID. + +Signed-off-by: Emil Tantilov +Tested-by: Phil Schmitt +Signed-off-by: Jeff Kirsher +Signed-off-by: Abdallah Chatila +Signed-off-by: Greg Kroah-Hartman + +--- + 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 f1d1f805c47..6cfcbbf1c86 100644 --- 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