Authentication-Results: name.execsw.org; dkim=pass (1024-bit key) header.d=netbsd.org header.i=@netbsd.org header.b=Xg1WQj58; dkim=fail reason="signature verification failed" (1024-bit key) header.d=netbsd.org header.i=@netbsd.org header.b=KNBxpj3m Received: by mail.netbsd.org (Postfix, from userid 605) id 5B20684D3E; Wed, 17 Apr 2024 16:26:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1713371172; bh=/cgLOhPJpiizxZWe0FvK3AODVV1a3KjPmyrx0zBNwbQ=; h=Date:From:Subject:To:List-Id:Reply-To:List-Unsubscribe; b=Xg1WQj58h5lw9PWZaxBvx0ODDfua/9oPQPhZpbjJPhCO+tS/5O9AaQKYn19YxH7c/ W+IKL8snPb+IVRJ784ntDb7tYye0ri0+cbAIPjIWF0ZijADqCSBMZqAohiu9LjRICV xvN5PbjlTlGMcaqF3WucwvS5DbiYVrgSZrp0kJAw= Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3EC7984EDB for ; Wed, 17 Apr 2024 16:26:11 +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 NxXieicsm78Y for ; Wed, 17 Apr 2024 16:26:10 +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 C37D284CD5 for ; Wed, 17 Apr 2024 16:26:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1713371170; bh=/cgLOhPJpiizxZWe0FvK3AODVV1a3KjPmyrx0zBNwbQ=; h=Date:From:Subject:To:Reply-To; b=KNBxpj3micRBUcwY8+9GO4epN4fn8PJidWsWqwDEQz+XNkiLiDxHg6B94RSWVRJGw 7ILSsTnSlwyi1lIxQudJqjt149rhKQbICTGLCwBnIX1BsxfUxi2t8Kc3TUaEvjfo4F uNHG/hu3VSW+6/w9SzMYiTa0kG1FkOWcAGj0ctoY= Received: by cvs.NetBSD.org (Postfix, from userid 500) id BB523FA2C; Wed, 17 Apr 2024 16:26:10 +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:26:10 +0000 From: "Martin Husemann" Subject: CVS commit: [netbsd-8] src/sys/dev/pci To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20240417162610.BB523FA2C@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:26:10 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-8]: if_iwn.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1953): 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.84.6.2 -r1.84.6.3 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.