From patchwork Thu Sep 28 18:35:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Grundler X-Patchwork-Id: 819716 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="JhijmFO3"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y33KY4zM3z9tX5 for ; Fri, 29 Sep 2017 04:35:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751315AbdI1Sfg (ORCPT ); Thu, 28 Sep 2017 14:35:36 -0400 Received: from mail-pg0-f49.google.com ([74.125.83.49]:50247 "EHLO mail-pg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750819AbdI1Sfe (ORCPT ); Thu, 28 Sep 2017 14:35:34 -0400 Received: by mail-pg0-f49.google.com with SMTP id p5so1397575pgn.7 for ; Thu, 28 Sep 2017 11:35: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=ND51MRMTWcbYDymz8eb3Wjp5oGbQfBf24l3N7PWQ1Hw=; b=JhijmFO3H5ix1kLRBfXukdJa+XLLAiJBzo0ffEjZk1DYtuO/VcyXxMUhukOfNDcFvu pr5o/WWj23ghA/lOX5Tywqt6YKviMGd1J3WcRUtzwnltY76dXO6dVnysnZ62tlDbbIjz hULIUkdmLiPiMcxnkDXWxl2fwbaMYnHN00Md0= 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=ND51MRMTWcbYDymz8eb3Wjp5oGbQfBf24l3N7PWQ1Hw=; b=HkYBPz1N1+T/uGoY3fy6rfyfG4Ml8oIZljvfdu7phBDw+tNnPv4SK5V1xia9kTfgGy Db6P8Lm9AQXUeQ7uYe9x4MwE21c87uCeGLCwC8WgAuAbZOIvV4uJHTC+CfuQQNfgTLwb b1ZF23GFlm6YD/0OLjyt/EgWO5vrSMgSSEbeaeo/xkNqmJMs6b2MfXhDh46EhOHi5fBU ddOVbJB30yHy2PSc3pWtw5pl58ZXvBAHqOU/DgUDhc+QILPFA/ZCa+Evj8lpQwfIbZ7T VehzjlI2hjtR0ua5fWeW76hYDvOlpvAgle4GAhYWeatCIUBG4vOi+bn1D7gfd/XFhCew z36A== X-Gm-Message-State: AHPjjUhUQMYrWdLR068EOsAv0nGE8FnU+YZfBcG5MjYSKuRag3oO0Tsq ACfs2viFsMsofGIkhlAvpGKKng== X-Google-Smtp-Source: AOwi7QDG12KqRcel0LkgO9zp1rMWSiwb4aEH8CvEv3ggbZhDu3s+3MK9h5h3OReME++LaqLgYgBqwg== X-Received: by 10.84.238.139 with SMTP id v11mr4672185plk.344.1506623733689; Thu, 28 Sep 2017 11:35:33 -0700 (PDT) Received: from firesword.mtv.corp.google.com ([172.22.112.105]) by smtp.gmail.com with ESMTPSA id f11sm4015822pgt.65.2017.09.28.11.35.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Sep 2017 11:35:31 -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 V4] r8152: add Linksys USB3GIGV1 id Date: Thu, 28 Sep 2017 11:35:00 -0700 Message-Id: <20170928183500.61199-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 Reviewed-by: Douglas Anderson --- drivers/net/usb/cdc_ether.c | 10 ++++++++++ drivers/net/usb/r8152.c | 2 ++ 2 files changed, 12 insertions(+) V4: use IS_ENABLED() to check CONFIG_USB_RTL8152 is m or y. (verified by adding #error to the new code and trying to compile Thanks Doug for the tip!) Add LINKSYS vendor #define in same order for both drivers. 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..677a85360db1 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c @@ -547,6 +547,7 @@ static const struct driver_info wwan_info = { #define REALTEK_VENDOR_ID 0x0bda #define SAMSUNG_VENDOR_ID 0x04e8 #define LENOVO_VENDOR_ID 0x17ef +#define LINKSYS_VENDOR_ID 0x13b1 #define NVIDIA_VENDOR_ID 0x0955 #define HP_VENDOR_ID 0x03f0 #define MICROSOFT_VENDOR_ID 0x045e @@ -737,6 +738,15 @@ static const struct usb_device_id products[] = { .driver_info = 0, }, +#if IS_ENABLED(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)}, {} };