Authentication-Results: name.execsw.org; dkim=pass (1024-bit key) header.d=netbsd.org header.i=@netbsd.org header.b=LGoMKE7B; dkim=fail reason="signature verification failed" (1024-bit key) header.d=netbsd.org header.i=@netbsd.org header.b=fJzf0kmD Received: by mail.netbsd.org (Postfix, from userid 605) id E55DE84D3E; Wed, 17 Apr 2024 16:24:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1713371068; bh=krNdLVJPALUtbkEQ0PbfrbDsbQ8iEIo9QW4/Y+9iETA=; h=Date:From:Subject:To:List-Id:Reply-To:List-Unsubscribe; b=LGoMKE7BEPJBBW0rGR4156M4724kMxB0ZJolh86bktKbVdP0SwkH0crwun4GZdE4m 6IeAmqR9n66Q06gbB93JwnwDnFKLIXf9/B0wMQN02HCdA6op11W0l8CRIJT07nVcbl 575hNnBJZCy+6Ufp3YLecoJWtwQY9x3rJ22dto5o= Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CA25A84E6B for ; Wed, 17 Apr 2024 16:24:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Authentication-Results: mail.netbsd.org (amavisd-new); dkim=pass (1024-bit key) header.d=netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id FggvnCMGD8Cp for ; Wed, 17 Apr 2024 16:24:26 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 59F7084CD5 for ; Wed, 17 Apr 2024 16:24:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1713371066; bh=krNdLVJPALUtbkEQ0PbfrbDsbQ8iEIo9QW4/Y+9iETA=; h=Date:From:Subject:To:Reply-To; b=fJzf0kmDiH5xeI8gIJRSBUw7IoFrJM6GhWAViM8EzirLgPLhwnoCZ2isC6ILlksWy rngoOuzNT5ypChcWO3ax71lhlSHt5DU0YQB+MXP4NC3gm1QNykFui5dnl6Oq8G6X1x nlyhpbl0H1c8lzWg/8tHOppWNKzYE/8fDVgkEz/w= Received: by cvs.NetBSD.org (Postfix, from userid 500) id 53E4BFA2C; Wed, 17 Apr 2024 16:24:26 +0000 (UTC) Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" MIME-Version: 1.0 Date: Wed, 17 Apr 2024 16:24:26 +0000 From: "Martin Husemann" Subject: CVS commit: [netbsd-9] src/sys/dev/pci To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20240417162426.53E4BFA2C@cvs.NetBSD.org> Sender: source-changes-owner@NetBSD.org List-Id: Precedence: bulk Reply-To: source-changes-d@NetBSD.org Mail-Reply-To: "Martin Husemann" Mail-Followup-To: source-changes-d@NetBSD.org List-Unsubscribe: Module Name: src Committed By: martin Date: Wed Apr 17 16:24:26 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-9]: if_iwn.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1825): sys/dev/pci/if_iwn.c: revision 1.100 if_iwn.c: pick up proper firmware for Centrino Wireless-N 130 Both variants should use iwlwifi-6000g2b-6 not iwlwifi-6000g2a-6. (It seems only two specific product variants use iwlwifi-6000g2a-6. We could simplify by reversing the sense of the test, as OpenBSD does, but it doesn't seem to matter much, as what we now match seems to be the full gamut possible, so the simpler diff was chosen here.) Addresses PR kern/58105 from wandrien.dev%gmail.com@localhost, with the PCI_PRODUCT_INTEL_WIFI_LINK_130_1 match tested by the reporter. Code inspection of the FreeBSD driver indicates we should safely be able to match PCI_PRODUCT_INTEL_WIFI_LINK_130_2 also. To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.91.4.1 src/sys/dev/pci/if_iwn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.