From: Greg Kroah-Hartman Date: Wed, 9 Dec 2015 03:28:28 +0000 (-0500) Subject: remove qmi_wwan-fix-entry-for-hp-lt4112-lte-hspa-gobi-4g-module.patch X-Git-Tag: v3.10.94~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=912e9d3c6bb33ddb60054a73c247303ea1ec43e4;p=thirdparty%2Fkernel%2Fstable-queue.git remove qmi_wwan-fix-entry-for-hp-lt4112-lte-hspa-gobi-4g-module.patch --- diff --git a/queue-4.1/qmi_wwan-fix-entry-for-hp-lt4112-lte-hspa-gobi-4g-module.patch b/queue-4.1/qmi_wwan-fix-entry-for-hp-lt4112-lte-hspa-gobi-4g-module.patch deleted file mode 100644 index 16d58e9ed33..00000000000 --- a/queue-4.1/qmi_wwan-fix-entry-for-hp-lt4112-lte-hspa-gobi-4g-module.patch +++ /dev/null @@ -1,55 +0,0 @@ -From foo@baz Tue Nov 17 14:35:45 PST 2015 -From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= -Date: Sun, 1 Nov 2015 01:34:50 +0100 -Subject: qmi_wwan: fix entry for HP lt4112 LTE/HSPA+ Gobi 4G Module -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= - -[ Upstream commit 70910791731b5956171e1bfcad707766b8e18fee ] - -The lt4112 is a HP branded Huawei me906e modem. Like other Huawei -modems, it does not have a fixed interface to function mapping. -Instead it uses a Huawei specific scheme: functions are mapped by -subclass and protocol. - -However, the HP vendor ID is used for modems from many different -manufacturers using different schemes, so we cannot apply a generic -vendor rule like we do for the Huawei vendor ID. - -Replace the previous lt4112 entry pointing to an arbitrary interface -number with a device specific subclass + protocol match. - -Reported-and-tested-by: Muri Nicanor -Tested-by: Martin Hauke -Fixes: bb2bdeb83fb1 ("qmi_wwan: Add support for HP lt4112 LTE/HSPA+ Gobi 4G Modem") -Signed-off-by: Bjørn Mork -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/usb/qmi_wwan.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/drivers/net/usb/qmi_wwan.c -+++ b/drivers/net/usb/qmi_wwan.c -@@ -539,6 +539,10 @@ static const struct usb_device_id produc - USB_CDC_PROTO_NONE), - .driver_info = (unsigned long)&qmi_wwan_info, - }, -+ { /* HP lt4112 LTE/HSPA+ Gobi 4G Module (Huawei me906e) */ -+ USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0x581d, USB_CLASS_VENDOR_SPEC, 1, 7), -+ .driver_info = (unsigned long)&qmi_wwan_info, -+ }, - - /* 3. Combined interface devices matching on interface number */ - {QMI_FIXED_INTF(0x0408, 0xea42, 4)}, /* Yota / Megafon M100-1 */ -@@ -788,7 +792,6 @@ static const struct usb_device_id produc - {QMI_FIXED_INTF(0x413c, 0x81a4, 8)}, /* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */ - {QMI_FIXED_INTF(0x413c, 0x81a8, 8)}, /* Dell Wireless 5808 Gobi(TM) 4G LTE Mobile Broadband Card */ - {QMI_FIXED_INTF(0x413c, 0x81a9, 8)}, /* Dell Wireless 5808e Gobi(TM) 4G LTE Mobile Broadband Card */ -- {QMI_FIXED_INTF(0x03f0, 0x581d, 4)}, /* HP lt4112 LTE/HSPA+ Gobi 4G Module (Huawei me906e) */ - - /* 4. Gobi 1000 devices */ - {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */ diff --git a/queue-4.1/series b/queue-4.1/series index 81cc33d8cf0..216a1aadf10 100644 --- a/queue-4.1/series +++ b/queue-4.1/series @@ -10,7 +10,6 @@ net-mlx4-copy-set-only-sizeof-struct-mlx4_eqe-bytes.patch tipc-linearize-arriving-name_distr-and-link_proto-buffers.patch stmmac-correctly-report-ptp-capabilities.patch ipmr-fix-possible-race-resulting-from-improper-usage-of-ip_inc_stats_bh-in-preemptible-context.patch -qmi_wwan-fix-entry-for-hp-lt4112-lte-hspa-gobi-4g-module.patch sit-fix-sit0-percpu-double-allocations.patch sfc-push-partner-queue-for-skb-xmit_more.patch net-avoid-null-deref-in-inet_ctl_sock_destroy.patch diff --git a/queue-4.2/qmi_wwan-fix-entry-for-hp-lt4112-lte-hspa-gobi-4g-module.patch b/queue-4.2/qmi_wwan-fix-entry-for-hp-lt4112-lte-hspa-gobi-4g-module.patch deleted file mode 100644 index b605d3efcb6..00000000000 --- a/queue-4.2/qmi_wwan-fix-entry-for-hp-lt4112-lte-hspa-gobi-4g-module.patch +++ /dev/null @@ -1,55 +0,0 @@ -From foo@baz Tue Nov 17 14:34:38 PST 2015 -From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= -Date: Sun, 1 Nov 2015 01:34:50 +0100 -Subject: qmi_wwan: fix entry for HP lt4112 LTE/HSPA+ Gobi 4G Module -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= - -[ Upstream commit 70910791731b5956171e1bfcad707766b8e18fee ] - -The lt4112 is a HP branded Huawei me906e modem. Like other Huawei -modems, it does not have a fixed interface to function mapping. -Instead it uses a Huawei specific scheme: functions are mapped by -subclass and protocol. - -However, the HP vendor ID is used for modems from many different -manufacturers using different schemes, so we cannot apply a generic -vendor rule like we do for the Huawei vendor ID. - -Replace the previous lt4112 entry pointing to an arbitrary interface -number with a device specific subclass + protocol match. - -Reported-and-tested-by: Muri Nicanor -Tested-by: Martin Hauke -Fixes: bb2bdeb83fb1 ("qmi_wwan: Add support for HP lt4112 LTE/HSPA+ Gobi 4G Modem") -Signed-off-by: Bjørn Mork -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/usb/qmi_wwan.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/drivers/net/usb/qmi_wwan.c -+++ b/drivers/net/usb/qmi_wwan.c -@@ -539,6 +539,10 @@ static const struct usb_device_id produc - USB_CDC_PROTO_NONE), - .driver_info = (unsigned long)&qmi_wwan_info, - }, -+ { /* HP lt4112 LTE/HSPA+ Gobi 4G Module (Huawei me906e) */ -+ USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0x581d, USB_CLASS_VENDOR_SPEC, 1, 7), -+ .driver_info = (unsigned long)&qmi_wwan_info, -+ }, - - /* 3. Combined interface devices matching on interface number */ - {QMI_FIXED_INTF(0x0408, 0xea42, 4)}, /* Yota / Megafon M100-1 */ -@@ -790,7 +794,6 @@ static const struct usb_device_id produc - {QMI_FIXED_INTF(0x413c, 0x81a8, 8)}, /* Dell Wireless 5808 Gobi(TM) 4G LTE Mobile Broadband Card */ - {QMI_FIXED_INTF(0x413c, 0x81a9, 8)}, /* Dell Wireless 5808e Gobi(TM) 4G LTE Mobile Broadband Card */ - {QMI_FIXED_INTF(0x03f0, 0x4e1d, 8)}, /* HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module */ -- {QMI_FIXED_INTF(0x03f0, 0x581d, 4)}, /* HP lt4112 LTE/HSPA+ Gobi 4G Module (Huawei me906e) */ - - /* 4. Gobi 1000 devices */ - {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */ diff --git a/queue-4.2/series b/queue-4.2/series index 5055c8f7022..b3536270b2d 100644 --- a/queue-4.2/series +++ b/queue-4.2/series @@ -18,7 +18,6 @@ ipv4-fix-to-not-remove-local-route-on-link-down.patch ipv4-update-rtnh_f_linkdown-flag-on-up-event.patch stmmac-correctly-report-ptp-capabilities.patch ipmr-fix-possible-race-resulting-from-improper-usage-of-ip_inc_stats_bh-in-preemptible-context.patch -qmi_wwan-fix-entry-for-hp-lt4112-lte-hspa-gobi-4g-module.patch sit-fix-sit0-percpu-double-allocations.patch sfc-push-partner-queue-for-skb-xmit_more.patch net-avoid-null-deref-in-inet_ctl_sock_destroy.patch diff --git a/queue-4.3/qmi_wwan-fix-entry-for-hp-lt4112-lte-hspa-gobi-4g-module.patch b/queue-4.3/qmi_wwan-fix-entry-for-hp-lt4112-lte-hspa-gobi-4g-module.patch deleted file mode 100644 index 070c60b8d43..00000000000 --- a/queue-4.3/qmi_wwan-fix-entry-for-hp-lt4112-lte-hspa-gobi-4g-module.patch +++ /dev/null @@ -1,55 +0,0 @@ -From foo@baz Tue Nov 17 14:33:46 PST 2015 -From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= -Date: Sun, 1 Nov 2015 01:34:50 +0100 -Subject: qmi_wwan: fix entry for HP lt4112 LTE/HSPA+ Gobi 4G Module -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= - -[ Upstream commit 70910791731b5956171e1bfcad707766b8e18fee ] - -The lt4112 is a HP branded Huawei me906e modem. Like other Huawei -modems, it does not have a fixed interface to function mapping. -Instead it uses a Huawei specific scheme: functions are mapped by -subclass and protocol. - -However, the HP vendor ID is used for modems from many different -manufacturers using different schemes, so we cannot apply a generic -vendor rule like we do for the Huawei vendor ID. - -Replace the previous lt4112 entry pointing to an arbitrary interface -number with a device specific subclass + protocol match. - -Reported-and-tested-by: Muri Nicanor -Tested-by: Martin Hauke -Fixes: bb2bdeb83fb1 ("qmi_wwan: Add support for HP lt4112 LTE/HSPA+ Gobi 4G Modem") -Signed-off-by: Bjørn Mork -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/usb/qmi_wwan.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/drivers/net/usb/qmi_wwan.c -+++ b/drivers/net/usb/qmi_wwan.c -@@ -539,6 +539,10 @@ static const struct usb_device_id produc - USB_CDC_PROTO_NONE), - .driver_info = (unsigned long)&qmi_wwan_info, - }, -+ { /* HP lt4112 LTE/HSPA+ Gobi 4G Module (Huawei me906e) */ -+ USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0x581d, USB_CLASS_VENDOR_SPEC, 1, 7), -+ .driver_info = (unsigned long)&qmi_wwan_info, -+ }, - - /* 3. Combined interface devices matching on interface number */ - {QMI_FIXED_INTF(0x0408, 0xea42, 4)}, /* Yota / Megafon M100-1 */ -@@ -791,7 +795,6 @@ static const struct usb_device_id produc - {QMI_FIXED_INTF(0x413c, 0x81a9, 8)}, /* Dell Wireless 5808e Gobi(TM) 4G LTE Mobile Broadband Card */ - {QMI_FIXED_INTF(0x413c, 0x81b1, 8)}, /* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card */ - {QMI_FIXED_INTF(0x03f0, 0x4e1d, 8)}, /* HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module */ -- {QMI_FIXED_INTF(0x03f0, 0x581d, 4)}, /* HP lt4112 LTE/HSPA+ Gobi 4G Module (Huawei me906e) */ - - /* 4. Gobi 1000 devices */ - {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */ diff --git a/queue-4.3/series b/queue-4.3/series index b7885f8b102..22977853eec 100644 --- a/queue-4.3/series +++ b/queue-4.3/series @@ -6,7 +6,6 @@ ipv4-fix-to-not-remove-local-route-on-link-down.patch ipv4-update-rtnh_f_linkdown-flag-on-up-event.patch stmmac-correctly-report-ptp-capabilities.patch ipmr-fix-possible-race-resulting-from-improper-usage-of-ip_inc_stats_bh-in-preemptible-context.patch -qmi_wwan-fix-entry-for-hp-lt4112-lte-hspa-gobi-4g-module.patch sit-fix-sit0-percpu-double-allocations.patch sfc-push-partner-queue-for-skb-xmit_more.patch net-avoid-null-deref-in-inet_ctl_sock_destroy.patch