From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
alan@lxorguk.ukuu.org.uk,
"Thomas Schäfer" <tschaefer@t-online.de>,
"Bjørn Mork" <bjorn@mork.no>
Subject: [ 13/16] USB: option: add TP-LINK HSUPA Modem MA180
Date: Fri, 18 Jan 2013 17:21:51 -0800 [thread overview]
Message-ID: <20130119012140.203089164@linuxfoundation.org> (raw)
In-Reply-To: <20130119012138.680057206@linuxfoundation.org>
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjørn Mork <bjorn@mork.no>
commit 99beb2e9687ffd61c92a9875141eabe6f57a71b9 upstream.
The driver description files gives these names to the vendor specific
functions on this modem:
Diagnostics VID_2357&PID_0201&MI_00
NMEA VID_2357&PID_0201&MI_01
Modem VID_2357&PID_0201&MI_03
Networkcard VID_2357&PID_0201&MI_04
Reported-by: Thomas Schäfer <tschaefer@t-online.de>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/usb/serial/option.c | 6 ++++++
1 file changed, 6 insertions(+)
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -449,6 +449,10 @@ static void option_instat_callback(struc
#define PETATEL_VENDOR_ID 0x1ff4
#define PETATEL_PRODUCT_NP10T 0x600e
+/* TP-LINK Incorporated products */
+#define TPLINK_VENDOR_ID 0x2357
+#define TPLINK_PRODUCT_MA180 0x0201
+
/* some devices interfaces need special handling due to a number of reasons */
enum option_blacklist_reason {
OPTION_BLACKLIST_NONE = 0,
@@ -1311,6 +1315,8 @@ static const struct usb_device_id option
{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x00, 0x00) },
{ USB_DEVICE(CELLIENT_VENDOR_ID, CELLIENT_PRODUCT_MEN200) },
{ USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T) },
+ { USB_DEVICE(TPLINK_VENDOR_ID, TPLINK_PRODUCT_MA180),
+ .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
{ } /* Terminating entry */
};
MODULE_DEVICE_TABLE(usb, option_ids);
next prev parent reply other threads:[~2013-01-19 1:23 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-19 1:21 [ 00/16] 3.0.60-stable review Greg Kroah-Hartman
2013-01-19 1:21 ` [ 01/16] sh: Fix FDPIC binary loader Greg Kroah-Hartman
2013-01-19 1:21 ` [ 02/16] tcm_fc: Do not indicate retry capability to initiators Greg Kroah-Hartman
2013-01-19 1:21 ` [ 03/16] tcm_fc: Do not report target role when target is not defined Greg Kroah-Hartman
2013-01-19 1:21 ` [ 04/16] s390/time: fix sched_clock() overflow Greg Kroah-Hartman
2013-01-19 1:21 ` [ 05/16] x86/Sandy Bridge: reserve pages when integrated graphics is present Greg Kroah-Hartman
2013-01-19 1:21 ` [ 06/16] ext4: init pagevec in ext4_da_block_invalidatepages Greg Kroah-Hartman
2013-01-19 1:21 ` [ 07/16] powerpc: fix wii_memory_fixups() compile error on 3.0.y tree Greg Kroah-Hartman
2013-01-19 1:21 ` [ 08/16] USB: fix endpoint-disabling for failed config changes Greg Kroah-Hartman
2013-01-19 1:21 ` [ 09/16] intel-iommu: Prevent devices with RMRRs from being placed into SI Domain Greg Kroah-Hartman
2013-01-19 1:21 ` [ 10/16] drbd: add missing part_round_stats to _drbd_start_io_acct Greg Kroah-Hartman
2013-01-19 1:21 ` [ 11/16] xhci: fix null-pointer dereference when destroying half-built segment rings Greg Kroah-Hartman
2013-01-19 1:21 ` [ 12/16] xen: Fix stack corruption in xen_failsafe_callback for 32bit PVOPS guests Greg Kroah-Hartman
2013-01-19 1:21 ` Greg Kroah-Hartman [this message]
2013-01-19 1:21 ` [ 14/16] USB: option: blacklist network interface on ONDA MT8205 4G LTE Greg Kroah-Hartman
2013-01-19 1:21 ` [ 15/16] serial:ifx6x60:Delete SPI timer when shut down port Greg Kroah-Hartman
2013-01-19 1:21 ` [ 16/16] staging: vt6656: Fix inconsistent structure packing Greg Kroah-Hartman
2013-01-19 18:50 ` [ 00/16] 3.0.60-stable review Shuah Khan
2013-01-20 9:00 ` Satoru Takeuchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130119012140.203089164@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=bjorn@mork.no \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tschaefer@t-online.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox