Module Name: src
Committed By: gutteridge
Date: Mon Apr 25 02:29:14 UTC 2022
Modified Files:
src/distrib/sets/lists/base: mi
src/external/intel-fw-public/iwl6005: Makefile
src/external/intel-fw-public/iwl6005/dist:
LICENSE.iwlwifi-6000g2a-ucode README.iwlwifi-6000g2a-ucode
src/sys/dev/pci: if_iwn.c
Added Files:
src/external/intel-fw-public/iwl6005/dist: iwlwifi-6000g2a-6.ucode
Removed Files:
src/external/intel-fw-public/iwl6005/dist: iwlwifi-6000g2a-5.ucode
Log Message:
Update firmware for Intel Centrino Advanced-N 6205 WiFi cards
Use the final version of firmware provided for these cards. This has
been tested with both variants of impacted iwn(4) cards (6005_2X2_1 and
6005_2X2_2, as found in a Dell E6230 and a Lenovo T420), improvements
noted.
To generate a diff of this commit:
cvs rdiff -u -r1.1293 -r1.1294 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.2 -r1.3 src/external/intel-fw-public/iwl6005/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/intel-fw-public/iwl6005/dist/LICENSE.iwlwifi-6000g2a-ucode \
src/external/intel-fw-public/iwl6005/dist/README.iwlwifi-6000g2a-ucode
cvs rdiff -u -r1.1 -r0 \
src/external/intel-fw-public/iwl6005/dist/iwlwifi-6000g2a-5.ucode
cvs rdiff -u -r0 -r1.1 \
src/external/intel-fw-public/iwl6005/dist/iwlwifi-6000g2a-6.ucode
cvs rdiff -u -r1.98 -r1.99 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.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1293 src/distrib/sets/lists/base/mi:1.1294
--- src/distrib/sets/lists/base/mi:1.1293 Wed Apr 6 14:20:07 2022
+++ src/distrib/sets/lists/base/mi Mon Apr 25 02:29:13 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1293 2022/04/06 14:20:07 reinoud Exp $
+# $NetBSD: mi,v 1.1294 2022/04/25 02:29:13 gutteridge Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -240,7 +240,8 @@
./libdata/firmware/if_iwn/iwlwifi-5000-2.ucode base-firmware-root firmware
./libdata/firmware/if_iwn/iwlwifi-5150-2.ucode base-firmware-root firmware
./libdata/firmware/if_iwn/iwlwifi-6000-4.ucode base-firmware-root firmware
-./libdata/firmware/if_iwn/iwlwifi-6000g2a-5.ucode base-firmware-root firmware
+./libdata/firmware/if_iwn/iwlwifi-6000g2a-5.ucode base-obsolete obsolete
+./libdata/firmware/if_iwn/iwlwifi-6000g2a-6.ucode base-firmware-root firmware
./libdata/firmware/if_iwn/iwlwifi-6000g2b-6.ucode base-firmware-root firmware
./libdata/firmware/if_iwn/iwlwifi-6050-5.ucode base-firmware-root firmware
./libdata/firmware/if_otus base-firmware-root
Index: src/external/intel-fw-public/iwl6005/Makefile
diff -u src/external/intel-fw-public/iwl6005/Makefile:1.2 src/external/intel-fw-public/iwl6005/Makefile:1.3
--- src/external/intel-fw-public/iwl6005/Makefile:1.2 Wed May 30 20:54:06 2018
+++ src/external/intel-fw-public/iwl6005/Makefile Mon Apr 25 02:29:13 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2018/05/30 20:54:06 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2022/04/25 02:29:13 gutteridge Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-6000g2a-ucode dist/README.iwlwifi-6000g2a-ucode \
- dist/iwlwifi-6000g2a-5.ucode
+ dist/iwlwifi-6000g2a-6.ucode
FILESDIR= ${FIRMWAREDIR}/if_iwn
Index: src/external/intel-fw-public/iwl6005/dist/LICENSE.iwlwifi-6000g2a-ucode
diff -u src/external/intel-fw-public/iwl6005/dist/LICENSE.iwlwifi-6000g2a-ucode:1.1 src/external/intel-fw-public/iwl6005/dist/LICENSE.iwlwifi-6000g2a-ucode:1.2
--- src/external/intel-fw-public/iwl6005/dist/LICENSE.iwlwifi-6000g2a-ucode:1.1 Fri May 20 01:59:14 2011
+++ src/external/intel-fw-public/iwl6005/dist/LICENSE.iwlwifi-6000g2a-ucode Mon Apr 25 02:29:13 2022
@@ -1,4 +1,4 @@
-Copyright (c) 2006-2011, Intel Corporation.
+Copyright (c) 2006-2012, Intel Corporation.
All rights reserved.
Redistribution. Redistribution and use in binary form, without
Index: src/external/intel-fw-public/iwl6005/dist/README.iwlwifi-6000g2a-ucode
diff -u src/external/intel-fw-public/iwl6005/dist/README.iwlwifi-6000g2a-ucode:1.1 src/external/intel-fw-public/iwl6005/dist/README.iwlwifi-6000g2a-ucode:1.2
--- src/external/intel-fw-public/iwl6005/dist/README.iwlwifi-6000g2a-ucode:1.1 Fri May 20 01:59:14 2011
+++ src/external/intel-fw-public/iwl6005/dist/README.iwlwifi-6000g2a-ucode Mon Apr 25 02:29:13 2022
@@ -1,5 +1,5 @@
Intel Wireless WiFi Link 6000G2A AGN Adapter
-Copyright (C) 2006-2011 Intel Corporation. All rights reserved.
+Copyright (C) 2006-2012 Intel Corporation. All rights reserved.
Microcode Package README.iwlwifi-6000g2a-ucode
@@ -12,11 +12,11 @@ INDEX
1. OVERVIEW
-The file iwlwifi-6000g2a-5.ucode provided in this package must be
+The file iwlwifi-6000g2a-6.ucode provided in this package must be
present on your system in order for the Intel Wireless WiFi Link
AGN driver for Linux (iwlagn) to operate on your system.
-The "-5" in the filename reflects an interface/architecture version number.
+The "-6" in the filename reflects an interface/architecture version number.
It will change only when changes in new uCode releases make the new uCode
incompatible with earlier drivers.
@@ -30,7 +30,7 @@ interest given the current operating mod
2. INSTALLATION
-The iwlagn driver will look for the file iwlwifi-6000g2a-5.ucode using the
+The iwlagn driver will look for the file iwlwifi-6000g2a-6.ucode using the
kernel's firmware_class infrastructure. More information can be found under
Documentation/firmware_class in kernel source. In order to function
correctly, you need to have this support enabled in your kernel. When
@@ -61,18 +61,18 @@ udev scripts of your distro, the default
Installation of the firmware is simply:
- % cp iwlwifi-6000g2a-5.ucode /lib/firmware
+ % cp iwlwifi-6000g2a-6.ucode /lib/firmware
You can now load the driver (see the INSTALL and README.iwlwifi provided with
the iwlwifi package for information on building and using that driver.)
3. LICENSE
-The microcode in this package (iwlwifi-6000g2a-5.ucode) is provided under the
+The microcode in this package (iwlwifi-6000g2a-6.ucode) is provided under the
terms of the following license (available in the file
LICENSE.iwlwifi-6000g2a-ucode):
-Copyright (c) 2006-2011, Intel Corporation.
+Copyright (c) 2006-2012, Intel Corporation.
All rights reserved.
Redistribution. Redistribution and use in binary form, without
Index: src/sys/dev/pci/if_iwn.c
diff -u src/sys/dev/pci/if_iwn.c:1.98 src/sys/dev/pci/if_iwn.c:1.99
--- src/sys/dev/pci/if_iwn.c:1.98 Fri Dec 31 14:25:23 2021
+++ src/sys/dev/pci/if_iwn.c Mon Apr 25 02:29:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwn.c,v 1.98 2021/12/31 14:25:23 riastradh Exp $ */
+/* $NetBSD: if_iwn.c,v 1.99 2022/04/25 02:29:14 gutteridge Exp $ */
/* $OpenBSD: if_iwn.c,v 1.135 2014/09/10 07:22:09 dcoppa Exp $ */
/*-
@@ -22,7 +22,7 @@
* adapters.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.98 2021/12/31 14:25:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.99 2022/04/25 02:29:14 gutteridge Exp $");
#define IWN_USE_RBUF /* Use local storage for RX */
#undef IWN_HWCRYPTO /* XXX does not even compile yet */
@@ -859,7 +859,7 @@ iwn5000_attach(struct iwn_softc *sc, pci
* PCI_PRODUCT_INTEL_WIFI_LINK_6005_2X2_2
*/
else
- sc->fwname = "iwlwifi-6000g2a-5.ucode";
+ sc->fwname = "iwlwifi-6000g2a-6.ucode";
break;
case IWN_HW_REV_TYPE_2030:
sc->limits = &iwn2030_sensitivity_limits;
Added files:
Index: src/external/intel-fw-public/iwl6005/dist/iwlwifi-6000g2a-6.ucode
Binary files are different
