From nobody Tue Nov 19 04:52:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XssYx3sfRz5dYRn; Tue, 19 Nov 2024 04:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XssYx2ZYlz4CYc; Tue, 19 Nov 2024 04:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731991973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b89kqNtnP7Y9luY7bshD1DLOT4cSb9vYsc7xlypd3qc=; b=BsTxcuA8C9YXRee3KN6ZOdTgCQux5Nz3evWRqKzUVM7+CRdV/7khN4bOQdswQoYzr/tIAw h/I/oLmMIbOZKIf7y/MUh/IRnzsPhag+l0HIOcjFpOMskzB1h4yhbZ2fKAl2l3NuWYvnY2 HeHJ540S0JjJujwFnAuL5gJ4dYLRZHYFlPGyNgH6kuGurbKmzxwDWd+1OlblyJm3r/OgzU IiU+t798jF7Md54MJm0Kn3ljXd2bES4Snbvh8xW2mWjrbzFAEcP6DHODV/dX+6vhsdfF/y np5Rjz8bQ61USVUy+K8dEKTJIf1qbgHnl4PayRUDVWaO/vw96X+rMJWwYsWrZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731991973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b89kqNtnP7Y9luY7bshD1DLOT4cSb9vYsc7xlypd3qc=; b=fjy1oVJGW0EXtSDZhOAa4bSsr8+hKdjmLRkr8IQ+TqmQ0AZgk6WT2xwJFxlacr6gEwn4eD K7MVGI/iWr2oGQcsoqBehvoy8Nyc23sCQwmg8X895Ovh7baF0iHz3If5kryz6qFNzTkEDQ 60PCEISj47pEmjaqeWerHlQbQ64YfD5KhHtZtczT8z+14w2vW+2OpOejO6CpzOUJPVXm4W 81Mk1/ccrLLDhQKSJnCh3jmLP4fJlkZ2P05kpdIXHLoNyWfoBO0co82hKZQD2q7mQjDZWM wmhyU2gIE96fCA9ab1vxCpKIjuUrr8vfTqiyJB88YKGi0oP/a/xrgz7/LOMw/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731991973; a=rsa-sha256; cv=none; b=frFrzSoQC6RO9AvRIK3pC8scB/qcGKsznJXTsEDSXxUm/XLAVsVu/9ZjMg0FdlANLm0CQc WvIxNDn1ZiRViK5c/0S+K1ZiPZ83WxZHilpx8ZmQXsGbTE5F/Id1kcEkQ4xrcJNlIB/KW4 j84RBJ6cUDVeeIeTKJu2z/WS0jp0p48Xxa3AudvQ6yFPLkiaKaRD43HHNMUCmIz5a6VHcc RihXvnkiVzQEMIBxA4VpP97K16hkwDeaO4XjWwGYiLoj0MbD+dzf5iAcR91S4piBiqr93y 6cf1FDh5pyoxiVNTUkrY/CLU5ElT0si+c9/dZSOAkJwTCbAQeSZ3ZrrsOMe7pQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XssYx290lz1B8w; Tue, 19 Nov 2024 04:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AJ4qrqF066413; Tue, 19 Nov 2024 04:52:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AJ4qrnT066410; Tue, 19 Nov 2024 04:52:53 GMT (envelope-from git) Date: Tue, 19 Nov 2024 04:52:53 GMT Message-Id: <202411190452.4AJ4qrnT066410@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 7098b90152dd - main - usb: fix the ID for the dual-band Wistron AR5523 USB NIC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7098b90152dddcaf10c43ff31a8f1f3a952267d5 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=7098b90152dddcaf10c43ff31a8f1f3a952267d5 commit 7098b90152dddcaf10c43ff31a8f1f3a952267d5 Author: Adrian Chadd AuthorDate: 2024-11-18 05:10:32 +0000 Commit: Adrian Chadd CommitDate: 2024-11-19 04:50:24 +0000 usb: fix the ID for the dual-band Wistron AR5523 USB NIC Use the correct ID, as I have one of these NICs. Add the previous one back in case it's out there in the wild. @emaste did a bit of a dig into the product numbers. @sam did change the ID from 0x0828 -> 082a in a commit a long while back. It's worth reading the code review for further details. However, I do have one of these NICs and I verified that it indeed has the given ID, and with some follow-up work to fix some race conditions, it works fine in 2GHz 11bg and 5GHz 11a operation. Differential Revision: https://reviews.freebsd.org/D47654 Obtained from: Linux, drivers/net/wireless/ath/ar5523/ar5523.c --- sys/dev/usb/usbdevs | 3 ++- sys/dev/usb/wlan/if_uath.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index a368cf84d9d5..50968a2c80cf 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -5025,7 +5025,8 @@ product WISTRONNEWEB UR055G 0x0711 UR055G product WISTRONNEWEB O8494 0x0804 ORiNOCO 802.11n product WISTRONNEWEB AR5523_1 0x0826 AR5523 product WISTRONNEWEB AR5523_1_NF 0x0827 AR5523 (no firmware) -product WISTRONNEWEB AR5523_2 0x082a AR5523 +product WISTRONNEWEB AR5523_2 0x0828 AR5523 +product WISTRONNEWEB AR5523_2_ALT 0x082a AR5523 product WISTRONNEWEB AR5523_2_NF 0x0829 AR5523 (no firmware) /* Xerox products */ diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c index e78003bc250a..580022f5a0c5 100644 --- a/sys/dev/usb/wlan/if_uath.c +++ b/sys/dev/usb/wlan/if_uath.c @@ -183,6 +183,7 @@ static const STRUCT_USB_HOST_ID uath_devs[] = { UATH_DEV(UMEDIA, AR5523_2), UATH_DEV(WISTRONNEWEB, AR5523_1), UATH_DEV(WISTRONNEWEB, AR5523_2), + UATH_DEV(WISTRONNEWEB, AR5523_2_ALT), UATH_DEV(ZCOM, AR5523) #undef UATH_DEV };