From patchwork Thu Dec 27 14:18:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 1912901 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id EE5CC3FF0F for ; Thu, 27 Dec 2012 14:18:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752749Ab2L0OS3 (ORCPT ); Thu, 27 Dec 2012 09:18:29 -0500 Received: from mail-we0-f181.google.com ([74.125.82.181]:56055 "EHLO mail-we0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752446Ab2L0OS2 (ORCPT ); Thu, 27 Dec 2012 09:18:28 -0500 Received: by mail-we0-f181.google.com with SMTP id t11so4442974wey.40 for ; Thu, 27 Dec 2012 06:18:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:subject:to:cc:from:date:mime-version:content-type :content-transfer-encoding:message-id; bh=bgGEDPYaTxmdoUOSMxS0OOHtKwVRMxDmnIBVSmhOuu0=; b=jkketZnLHvqQXcDJj4rkY8AJJ+aIfjoCfR4kmNr24sMRnlbI95QJd4BTX2KDEFvRLD Hluy42or8Xw36q2E95Nxe91/v7D7fe1HBeyRCVq3029+BPafp5OjIe9NLJpIYMpM+Fmj ZYaQUiDtNHs1LAHD/p4/5vG84EUVSIWt6p2gOZlr0/GcIPjTbAuNkiFTRFJ467wOP4v4 aprg704UPR3upXo39jFytLhT7jLl3mROyXQI5ErsJ+aN9SK+ZrQnl8YM/pQRKVPGjG/k HLFV3TIa+oWbXiG8N3spxYRiCQTKmht5R+WbmQruK8PAL0PgrdlSja7KsOTwfYKLFCWI uc/A== X-Received: by 10.194.7.104 with SMTP id i8mr49105473wja.27.1356617904928; Thu, 27 Dec 2012 06:18:24 -0800 (PST) Received: from debian64.localnet (pD9F8B8A1.dip.t-dialin.net. [217.248.184.161]) by mx.google.com with ESMTPS id bz12sm49432132wib.5.2012.12.27.06.18.23 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Dec 2012 06:18:23 -0800 (PST) Received: from localhost ([127.0.0.1] helo=debian64.localnet ident=chuck) by debian64.localnet with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1ToEHt-0003T8-L6; Thu, 27 Dec 2012 15:18:21 +0100 Subject: [PATCH -stable] p54usb: add USBIDs for two more p54usb devices To: linux-wireless@vger.kernel.org Cc: linville@tuxdriver.com From: Christian Lamparter Date: Thu, 27 Dec 2012 15:18:20 +0100 MIME-Version: 1.0 Message-Id: <201212271518.20770.chunkeey@googlemail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org This patch adds USBIDs for: - DrayTek Vigor 530 - Zoom 4410a It also adds a note about Gemtek WUBI-100GW and SparkLAN WL-682 USBID conflict [WUBI-100GW is a ISL3886+NET2280 (LM86 firmare) solution, whereas WL-682 is a ISL3887 (LM87 firmware)] device. Source: Cc: Signed-off-by: Christian Lamparter --- drivers/net/wireless/p54/p54usb.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c index 64b944b..800a165 100644 --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c @@ -47,6 +47,7 @@ static struct usb_device_id p54u_table[] = { {USB_DEVICE(0x0411, 0x0050)}, /* Buffalo WLI2-USB2-G54 */ {USB_DEVICE(0x045e, 0x00c2)}, /* Microsoft MN-710 */ {USB_DEVICE(0x0506, 0x0a11)}, /* 3COM 3CRWE254G72 */ + {USB_DEVICE(0x0675, 0x0530)}, /* DrayTek Vigor 530 */ {USB_DEVICE(0x06b9, 0x0120)}, /* Thomson SpeedTouch 120g */ {USB_DEVICE(0x0707, 0xee06)}, /* SMC 2862W-G */ {USB_DEVICE(0x07aa, 0x001c)}, /* Corega CG-WLUSB2GT */ @@ -82,6 +83,7 @@ static struct usb_device_id p54u_table[] = { {USB_DEVICE(0x06a9, 0x000e)}, /* Westell 802.11g USB (A90-211WG-01) */ {USB_DEVICE(0x06b9, 0x0121)}, /* Thomson SpeedTouch 121g */ {USB_DEVICE(0x0707, 0xee13)}, /* SMC 2862W-G version 2 */ + {USB_DEVICE(0x0803, 0x4310)}, /* Zoom 4410a */ {USB_DEVICE(0x083a, 0x4503)}, /* T-Com Sinus 154 data II */ {USB_DEVICE(0x083a, 0x4521)}, /* Siemens Gigaset USB Adapter 54 version 2 */ {USB_DEVICE(0x083a, 0xc501)}, /* Zoom Wireless-G 4410 */ @@ -102,6 +104,7 @@ static struct usb_device_id p54u_table[] = { {USB_DEVICE(0x13B1, 0x000C)}, /* Linksys WUSB54AG */ {USB_DEVICE(0x1413, 0x5400)}, /* Telsey 802.11g USB2.0 Adapter */ {USB_DEVICE(0x1435, 0x0427)}, /* Inventel UR054G */ + /* {USB_DEVICE(0x15a9, 0x0002)}, * Also SparkLAN WL-682 with 3887 */ {USB_DEVICE(0x1668, 0x1050)}, /* Actiontec 802UIG-1 */ {USB_DEVICE(0x1740, 0x1000)}, /* Senao NUB-350 */ {USB_DEVICE(0x2001, 0x3704)}, /* DLink DWL-G122 rev A2 */