From owner-svn-src-all@freebsd.org Tue Jan 24 03:00:24 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 310A4CBE6B4; Tue, 24 Jan 2017 03:00:24 +0000 (UTC) (envelope-from kevlo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 04F4CAB8; Tue, 24 Jan 2017 03:00:23 +0000 (UTC) (envelope-from kevlo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0O30NVs068031; Tue, 24 Jan 2017 03:00:23 GMT (envelope-from kevlo@FreeBSD.org) Received: (from kevlo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0O30MMN068028; Tue, 24 Jan 2017 03:00:22 GMT (envelope-from kevlo@FreeBSD.org) Message-Id: <201701240300.v0O30MMN068028@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevlo set sender to kevlo@FreeBSD.org using -f From: Kevin Lo Date: Tue, 24 Jan 2017 03:00:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r312681 - in head: etc/devd sys/dev/rtwn/usb sys/dev/usb X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 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: Tue, 24 Jan 2017 03:00:24 -0000 Author: kevlo Date: Tue Jan 24 03:00:22 2017 New Revision: 312681 URL: https://svnweb.freebsd.org/changeset/base/312681 Log: Sort REALTEK section and remove duplicate entry for RTL8192CU. Modified: head/etc/devd/usb.conf head/sys/dev/rtwn/usb/rtwn_usb_attach.h head/sys/dev/usb/usbdevs Modified: head/etc/devd/usb.conf ============================================================================== --- head/etc/devd/usb.conf Tue Jan 24 02:35:38 2017 (r312680) +++ head/etc/devd/usb.conf Tue Jan 24 03:00:22 2017 (r312681) @@ -2737,7 +2737,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0bda"; - match "product" "(0x8176|0x8177|0x8178|0x8178|0x8179|0x817a|0x817b|0x817c|0x817d|0x817e|0x817f)"; + match "product" "(0x8176|0x8177|0x8178|0x8179|0x817a|0x817b|0x817c|0x817d|0x817e|0x817f)"; action "kldload -n if_rtwn_usb"; }; Modified: head/sys/dev/rtwn/usb/rtwn_usb_attach.h ============================================================================== --- head/sys/dev/rtwn/usb/rtwn_usb_attach.h Tue Jan 24 02:35:38 2017 (r312680) +++ head/sys/dev/rtwn/usb/rtwn_usb_attach.h Tue Jan 24 03:00:22 2017 (r312681) @@ -94,7 +94,6 @@ static const STRUCT_USB_HOST_ID rtwn_dev RTWN_RTL8192CU_DEV(REALTEK, RTL8191CU), RTWN_RTL8192CU_DEV(REALTEK, RTL8192CE), RTWN_RTL8192CU_DEV(REALTEK, RTL8192CU), - RTWN_RTL8192CU_DEV(REALTEK, RTL8192CU_1), RTWN_RTL8192CU_DEV(SITECOMEU, RTL8188CU_1), RTWN_RTL8192CU_DEV(SITECOMEU, RTL8188CU_2), RTWN_RTL8192CU_DEV(SITECOMEU, RTL8192CU), Modified: head/sys/dev/usb/usbdevs ============================================================================== --- head/sys/dev/usb/usbdevs Tue Jan 24 02:35:38 2017 (r312680) +++ head/sys/dev/usb/usbdevs Tue Jan 24 03:00:22 2017 (r312681) @@ -3825,27 +3825,26 @@ product REALTEK RTL8172 0x8172 RTL8172 product REALTEK RTL8173 0x8173 RTL8173 product REALTEK RTL8174 0x8174 RTL8174 product REALTEK RTL8188CU_0 0x8176 RTL8188CU -product REALTEK RTL8192CU_1 0x8178 RTL8192CU +product REALTEK RTL8191CU 0x8177 RTL8191CU +product REALTEK RTL8192CU 0x8178 RTL8192CU product REALTEK RTL8188EU 0x8179 RTL8188EU -product REALTEK RTL8188CE_1 0x817e RTL8188CE product REALTEK RTL8188CU_1 0x817a RTL8188CU product REALTEK RTL8188CU_2 0x817b RTL8188CU +product REALTEK RTL8192CE 0x817c RTL8192CE +product REALTEK RTL8188RU_1 0x817d RTL8188RU +product REALTEK RTL8188CE_1 0x817e RTL8188CE +product REALTEK RTL8188RU_3 0x817f RTL8188RU product REALTEK RTL8187 0x8187 RTL8187 Wireless Adapter product REALTEK RTL8187B_0 0x8189 RTL8187B Wireless Adapter +product REALTEK RTL8188CUS 0x818a RTL8188CUS product REALTEK RTL8192EU 0x818b RTL8192EU product REALTEK RTL8188CU_3 0x8191 RTL8188CU product REALTEK RTL8196EU 0x8196 RTL8196EU product REALTEK RTL8187B_1 0x8197 RTL8187B Wireless Adapter product REALTEK RTL8187B_2 0x8198 RTL8187B Wireless Adapter -product REALTEK RTL8188CUS 0x818a RTL8188CUS -product REALTEK RTL8188CU_COMBO 0x8754 RTL8188CU -product REALTEK RTL8191CU 0x8177 RTL8191CU -product REALTEK RTL8192CU 0x8178 RTL8192CU -product REALTEK RTL8192CE 0x817c RTL8192CE -product REALTEK RTL8188RU_1 0x817d RTL8188RU -product REALTEK RTL8188RU_3 0x817f RTL8188RU product REALTEK RTL8712 0x8712 RTL8712 -product REALTEK RTL8713 0x8712 RTL8713 +product REALTEK RTL8713 0x8713 RTL8713 +product REALTEK RTL8188CU_COMBO 0x8754 RTL8188CU product REALTEK RTL8723BU 0xb720 RTL8723BU product REALTEK RTL8192SU 0xc512 RTL8192SU