From patchwork Wed Sep 27 17:28:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Grundler X-Patchwork-Id: 819243 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Ce6+OHeT"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y2Ptl35Mbz9tXp for ; Thu, 28 Sep 2017 03:28:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751891AbdI0R2h (ORCPT ); Wed, 27 Sep 2017 13:28:37 -0400 Received: from mail-pf0-f169.google.com ([209.85.192.169]:46457 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751372AbdI0R2e (ORCPT ); Wed, 27 Sep 2017 13:28:34 -0400 Received: by mail-pf0-f169.google.com with SMTP id r68so7585223pfj.3 for ; Wed, 27 Sep 2017 10:28:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=l1/hyOO0v7NbFkXYv2RXU4CXxMHuza+aua0MlfdTzl0=; b=Ce6+OHeTIDymZ57BT3y0kpAq5JMFBgtE6MxXcxJEnXtHWpr0xzAUZLqvorOK4AIsgK ZzFaGW3qHZfSfuehveC8V9jKvTJDSdOiSRUNZXXCNuGAYF/WN2XATu4XAG4eEIGl6Sx8 A2HZfs0znh10ZMlgDpSuhcgIussYTv4ihQy3A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=l1/hyOO0v7NbFkXYv2RXU4CXxMHuza+aua0MlfdTzl0=; b=H8Biv8P5UsBWbgFZr1c6aROXAwi9qeEKhnG8W/m7ST780dgvVAhkKk5xwRiG13Bo7E aOzhwoWsbWkixJwlcWe91bp2wQaNDywXQJOeIKskmAAWip2WbbQoZZ/yNLaZCDU8qf1B IMHjtasCwh7i+xUbNhPIzAqgG1sVJfrKaJhSHnthhCC7ZBWxCSP2Rs1Ql2mr9iDPDE93 sA/rfB1uVev8A+8meQu8pJnBB8sjP2/GOF2FfA/EKbeIjSVa/msB+D9LsQ0poKKHSCgt iKDlV6dNqrtrSk9fWsMGO+LOkVrJabMV/PCceI9+UF0r1tLfZspyxFIdh7gRYa+uCDet ngUQ== X-Gm-Message-State: AHPjjUhxLJHgOFS1tK8qG2c4sqb/7HY1rKfIC78jLFK9MXuH50IP+CT3 a8s0xXQkBs8Yl2z0QopDtsPupA== X-Google-Smtp-Source: AOwi7QAHjpUXA7JaLOUq6CeFFSqNQBEL4k8PyYWi+u6sxQVlmv2GWwi8TlA1dIAmVs/wug2Rdp+wfw== X-Received: by 10.98.63.140 with SMTP id z12mr1951586pfj.218.1506533314312; Wed, 27 Sep 2017 10:28:34 -0700 (PDT) Received: from firesword.mtv.corp.google.com ([172.22.112.105]) by smtp.gmail.com with ESMTPSA id t25sm22791707pfe.96.2017.09.27.10.28.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Sep 2017 10:28:32 -0700 (PDT) From: Grant Grundler To: Hayes Wang , Oliver Neukum Cc: linux-usb , "David S . Miller" , LKML , netdev@vger.kernel.org, Grant Grundler Subject: [PATCH V3] r8152: add Linksys USB3GIGV1 id Date: Wed, 27 Sep 2017 10:28:02 -0700 Message-Id: <20170927172802.80654-1-grundler@chromium.org> X-Mailer: git-send-email 2.14.2.822.g60be5d43e6-goog Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This linksys dongle by default comes up in cdc_ether mode. This patch allows r8152 to claim the device: Bus 002 Device 002: ID 13b1:0041 Linksys Signed-off-by: Grant Grundler --- drivers/net/usb/cdc_ether.c | 10 ++++++++++ drivers/net/usb/r8152.c | 2 ++ 2 files changed, 12 insertions(+) V3: for backwards compat, add #ifdef CONFIG_USB_RTL8152 around the cdc_ether blacklist entry so the cdc_ether driver can still claim the device if r8152 driver isn't configured. V2: add LINKSYS_VENDOR_ID to cdc_ether blacklist diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index 8ab281b478f2..446dcc0f1f70 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c @@ -546,6 +546,7 @@ static const struct driver_info wwan_info = { #define DELL_VENDOR_ID 0x413C #define REALTEK_VENDOR_ID 0x0bda #define SAMSUNG_VENDOR_ID 0x04e8 +#define LINKSYS_VENDOR_ID 0x13b1 #define LENOVO_VENDOR_ID 0x17ef #define NVIDIA_VENDOR_ID 0x0955 #define HP_VENDOR_ID 0x03f0 @@ -737,6 +738,15 @@ static const struct usb_device_id products[] = { .driver_info = 0, }, +#ifdef CONFIG_USB_RTL8152 +/* Linksys USB3GIGV1 Ethernet Adapter */ +{ + USB_DEVICE_AND_INTERFACE_INFO(LINKSYS_VENDOR_ID, 0x0041, USB_CLASS_COMM, + USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), + .driver_info = 0, +}, +#endif + /* ThinkPad USB-C Dock (based on Realtek RTL8153) */ { USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x3062, USB_CLASS_COMM, diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index ceb78e2ea4f0..941ece08ba78 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -613,6 +613,7 @@ enum rtl8152_flags { #define VENDOR_ID_MICROSOFT 0x045e #define VENDOR_ID_SAMSUNG 0x04e8 #define VENDOR_ID_LENOVO 0x17ef +#define VENDOR_ID_LINKSYS 0x13b1 #define VENDOR_ID_NVIDIA 0x0955 #define MCU_TYPE_PLA 0x0100 @@ -5316,6 +5317,7 @@ static const struct usb_device_id rtl8152_table[] = { {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x7205)}, {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x720c)}, {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x7214)}, + {REALTEK_USB_DEVICE(VENDOR_ID_LINKSYS, 0x0041)}, {REALTEK_USB_DEVICE(VENDOR_ID_NVIDIA, 0x09ff)}, {} };