From owner-svn-src-all@FreeBSD.ORG Thu Jun 23 15:28:54 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E113D1065673; Thu, 23 Jun 2011 15:28:54 +0000 (UTC) (envelope-from sanpei@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id CFD488FC19; Thu, 23 Jun 2011 15:28:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5NFSsCh005012; Thu, 23 Jun 2011 15:28:54 GMT (envelope-from sanpei@svn.freebsd.org) Received: (from sanpei@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5NFSse9005008; Thu, 23 Jun 2011 15:28:54 GMT (envelope-from sanpei@svn.freebsd.org) Message-Id: <201106231528.p5NFSse9005008@svn.freebsd.org> From: MIHIRA Sanpei Yoshiro Date: Thu, 23 Jun 2011 15:28:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r223476 - in stable/8: share/man/man4 sys/dev/usb sys/dev/usb/wlan X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jun 2011 15:28:55 -0000 Author: sanpei Date: Thu Jun 23 15:28:54 2011 New Revision: 223476 URL: http://svn.freebsd.org/changeset/base/223476 Log: Merge r216057 from head: Add new device ids. Buffalo (Melco Inc.) WLI-UC-G PR: 141777 Modified: stable/8/share/man/man4/rum.4 stable/8/sys/dev/usb/usbdevs stable/8/sys/dev/usb/wlan/if_rum.c Modified: stable/8/share/man/man4/rum.4 ============================================================================== --- stable/8/share/man/man4/rum.4 Thu Jun 23 15:10:44 2011 (r223475) +++ stable/8/share/man/man4/rum.4 Thu Jun 23 15:28:54 2011 (r223476) @@ -93,6 +93,7 @@ including: .It "Buffalo WLI-U2-SG54HP" Ta USB .It "Buffalo WLI-U2-SG54HG" Ta USB .It "Buffalo WLI-U2-G54HP" Ta USB +.It "Buffalo WLI-UC-G" Ta USB .It "CNet CWD-854 ver F" Ta USB .It "Conceptronic C54RU ver 2" Ta USB .It "Corega CG-WLUSB2GO" Ta USB Modified: stable/8/sys/dev/usb/usbdevs ============================================================================== --- stable/8/sys/dev/usb/usbdevs Thu Jun 23 15:10:44 2011 (r223475) +++ stable/8/sys/dev/usb/usbdevs Thu Jun 23 15:28:54 2011 (r223476) @@ -2156,6 +2156,7 @@ product MELCO SG54HG 0x00f4 WLI-U2-SG54 product MELCO WLRUCG 0x0116 WLR-UC-G product MELCO WLRUCGAOSS 0x0119 WLR-UC-G-AOSS product MELCO WLIUCAG300N 0x012e WLI-UC-AG300N +product MELCO WLIUCG 0x0137 WLI-UC-G product MELCO RT2870_1 0x0148 RT2870 product MELCO RT2870_2 0x0150 RT2870 product MELCO WLIUCGN 0x015d WLI-UC-GN Modified: stable/8/sys/dev/usb/wlan/if_rum.c ============================================================================== --- stable/8/sys/dev/usb/wlan/if_rum.c Thu Jun 23 15:10:44 2011 (r223475) +++ stable/8/sys/dev/usb/wlan/if_rum.c Thu Jun 23 15:28:54 2011 (r223476) @@ -118,6 +118,7 @@ static const struct usb_device_id rum_de RUM_DEV(HUAWEI3COM, WUB320G), RUM_DEV(MELCO, G54HP), RUM_DEV(MELCO, SG54HP), + RUM_DEV(MELCO, WLIUCG), RUM_DEV(MELCO, WLRUCG), RUM_DEV(MELCO, WLRUCGAOSS), RUM_DEV(MSI, RT2573_1),