From patchwork Sat Mar 23 13:59:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 1062242 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=aquantia.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=AQUANTIA1COM.onmicrosoft.com header.i=@AQUANTIA1COM.onmicrosoft.com header.b="i5PlCYuz"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44RMbh2ZrNz9sSN for ; Sun, 24 Mar 2019 00:59:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727556AbfCWN75 (ORCPT ); Sat, 23 Mar 2019 09:59:57 -0400 Received: from mail-eopbgr740057.outbound.protection.outlook.com ([40.107.74.57]:63968 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726118AbfCWN75 (ORCPT ); Sat, 23 Mar 2019 09:59:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vc+stiMo6f7xINdjbhCv45ZSgDfiOEi3tZU6IuKSstc=; b=i5PlCYuz3vzaKfz56pJmCQ+hXdvwyO/vo94j8j+UcXTfxfiQSEITQptx7FdR0xtu97KsI3CSdyMWpBm6hmHfS1CRIjDwO98brYu+j7eESGxVNyO3FJEVNdGmMXrW2PdVLBtx0ky+7K0vMGhKr9pT0R4ksuhVDjvkfTwpXHkYl2s= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB2779.namprd11.prod.outlook.com (20.176.100.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1730.16; Sat, 23 Mar 2019 13:59:54 +0000 Received: from DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b]) by DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b%3]) with mapi id 15.20.1730.017; Sat, 23 Mar 2019 13:59:54 +0000 From: Igor Russkikh To: "David S . Miller" CC: "netdev@vger.kernel.org" , Dmitry Bezrukov Subject: [PATCH net] net: usb: aqc111: Extend HWID table by QNAP device Thread-Topic: [PATCH net] net: usb: aqc111: Extend HWID table by QNAP device Thread-Index: AQHU4YCwN+THAK2uik2FmAVNJJEgKg== Date: Sat, 23 Mar 2019 13:59:53 +0000 Message-ID: <20190323135934.23749-1-igor.russkikh@aquantia.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR07CA0105.namprd07.prod.outlook.com (2603:10b6:a03:12b::46) To DM6PR11MB3625.namprd11.prod.outlook.com (2603:10b6:5:13a::21) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Igor.Russkikh@aquantia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [95.79.108.179] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 95e69b01-f7bc-4aa4-3e48-08d6af97d2fc x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB2779; x-ms-traffictypediagnostic: DM6PR11MB2779: x-microsoft-antispam-prvs: x-forefront-prvs: 0985DA2459 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(39840400004)(346002)(376002)(136003)(366004)(199004)(189003)(5660300002)(6486002)(2616005)(8676002)(8936002)(81156014)(50226002)(86362001)(81166006)(1076003)(99286004)(6116002)(44832011)(97736004)(105586002)(106356001)(486006)(7736002)(305945005)(71190400001)(71200400001)(68736007)(256004)(14444005)(6512007)(14454004)(2906002)(107886003)(6916009)(26005)(476003)(3846002)(53936002)(52116002)(186003)(316002)(54906003)(6436002)(72206003)(102836004)(66066001)(386003)(6506007)(478600001)(4326008)(25786009)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB2779; H:DM6PR11MB3625.namprd11.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: aquantia.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 1PP0XEXdvutVYmWr5YCIQqb6U85ucr+Qh9aUYAmaXjkGOo2oBD766Zrfx2Oq5s3QNpwXDcaNXCnTGI9aa73gW2jfg/2Mk71f6m64LmEN3EW1ab1JafTmn2BkqckWpMnYMg7QUt2QMFLX+5/rn3awo85WTA+HItcsnbZPObxiPre6BfXdAZXfPvhgxuSb6BnZakLPU6nCCmU5EqhjhFQ9GbE2MY2sTMvIE97At2ig5y5aO/v+87UmYze8ME7Qrh9mRLKtB7aSv0UPIU9NEkDkAH+OsCjsJtb82XUFGlx+Q0IU2XAkejYdmXgdISav50zVco/Z3b4ablv90LGnCLa5pH4zb5IWYpo2a2okdPkOIF81t3X6el8IueGv5WlgYD/JUYG12P8Q1+nxBDuTx7eus9es/tdD9ic59E3MwpGjaSM= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 95e69b01-f7bc-4aa4-3e48-08d6af97d2fc X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Mar 2019 13:59:53.7585 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 83e2e134-991c-4ede-8ced-34d47e38e6b1 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB2779 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Dmitry Bezrukov New device of QNAP based on aqc111u Add this ID to blacklist of cdc_ether driver as well Signed-off-by: Dmitry Bezrukov --- drivers/net/usb/aqc111.c | 15 +++++++++++++++ drivers/net/usb/cdc_ether.c | 8 ++++++++ 2 files changed, 23 insertions(+) diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c index 820a2fe7d027..aff995be2a31 100644 --- a/drivers/net/usb/aqc111.c +++ b/drivers/net/usb/aqc111.c @@ -1301,6 +1301,20 @@ static const struct driver_info trendnet_info = { .tx_fixup = aqc111_tx_fixup, }; +static const struct driver_info qnap_info = { + .description = "QNAP QNA-UC5G1T USB to 5GbE Adapter", + .bind = aqc111_bind, + .unbind = aqc111_unbind, + .status = aqc111_status, + .link_reset = aqc111_link_reset, + .reset = aqc111_reset, + .stop = aqc111_stop, + .flags = FLAG_ETHER | FLAG_FRAMING_AX | + FLAG_AVOID_UNLINK_URBS | FLAG_MULTI_PACKET, + .rx_fixup = aqc111_rx_fixup, + .tx_fixup = aqc111_tx_fixup, +}; + static int aqc111_suspend(struct usb_interface *intf, pm_message_t message) { struct usbnet *dev = usb_get_intfdata(intf); @@ -1455,6 +1469,7 @@ static const struct usb_device_id products[] = { {AQC111_USB_ETH_DEV(0x0b95, 0x2790, asix111_info)}, {AQC111_USB_ETH_DEV(0x0b95, 0x2791, asix112_info)}, {AQC111_USB_ETH_DEV(0x20f4, 0xe05a, trendnet_info)}, + {AQC111_USB_ETH_DEV(0x1c04, 0x0015, qnap_info)}, { },/* END */ }; MODULE_DEVICE_TABLE(usb, products); diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index 5512a1038721..3e9b2c319e45 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c @@ -851,6 +851,14 @@ static const struct usb_device_id products[] = { .driver_info = 0, }, +/* QNAP QNA-UC5G1T USB to 5GbE Adapter (based on AQC111U) */ +{ + USB_DEVICE_AND_INTERFACE_INFO(0x1c04, 0x0015, USB_CLASS_COMM, + USB_CDC_SUBCLASS_ETHERNET, + USB_CDC_PROTO_NONE), + .driver_info = 0, +}, + /* WHITELIST!!! * * CDC Ether uses two interfaces, not necessarily consecutive.