mirror of
https://github.com/torvalds/linux.git
synced 2026-07-28 01:55:51 +02:00
Merge branch 'rndis_host-add-le310x1-id-and-enable-low-power-handling'
Shaoxu Liu says: ==================== rndis_host: add LE310X1 ID and enable low-power handling This series adds RNDIS support for Telit Cinterion LE310X1 and then enables USB power management for that specific ID. ==================== Link: https://patch.msgid.link/tencent_29CB862D5756CBCBAFD2EE436EBAC98A7E05@qq.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
commit
2b04834c75
|
|
@ -630,6 +630,17 @@ static const struct driver_info zte_rndis_info = {
|
|||
.tx_fixup = rndis_tx_fixup,
|
||||
};
|
||||
|
||||
static const struct driver_info rndis_info_lowpower = {
|
||||
.description = "RNDIS device",
|
||||
.flags = FLAG_ETHER | FLAG_POINTTOPOINT | FLAG_FRAMING_RN | FLAG_NO_SETINT,
|
||||
.bind = rndis_bind,
|
||||
.unbind = rndis_unbind,
|
||||
.status = rndis_status,
|
||||
.rx_fixup = rndis_rx_fixup,
|
||||
.tx_fixup = rndis_tx_fixup,
|
||||
.manage_power = usbnet_manage_power,
|
||||
};
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
static const struct usb_device_id products [] = {
|
||||
|
|
@ -657,6 +668,11 @@ static const struct usb_device_id products [] = {
|
|||
/* RNDIS is MSFT's un-official variant of CDC ACM */
|
||||
USB_INTERFACE_INFO(USB_CLASS_COMM, 2 /* ACM */, 0x0ff),
|
||||
.driver_info = (unsigned long) &rndis_info,
|
||||
}, {
|
||||
/* Telit Cinterion LE310X1 RNDIS */
|
||||
USB_DEVICE_AND_INTERFACE_INFO(0x1bc7, 0x7030,
|
||||
USB_CLASS_WIRELESS_CONTROLLER, 1, 3),
|
||||
.driver_info = (unsigned long)&rndis_info_lowpower,
|
||||
}, {
|
||||
/* "ActiveSync" is an undocumented variant of RNDIS, used in WM5 */
|
||||
USB_INTERFACE_INFO(USB_CLASS_MISC, 1, 1),
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user