diff options
| author | rpaulo <rpaulo@FreeBSD.org> | 2009-10-24 09:55:11 +0000 |
|---|---|---|
| committer | rpaulo <rpaulo@FreeBSD.org> | 2009-10-24 09:55:11 +0000 |
| commit | f97bf23fd9af2de32e50125c0c9b7b656bd22fb2 (patch) | |
| tree | 400c66ff689466e4555a48bb05a0ca42ec189b3b /sys/modules | |
| parent | a5668d204285526655d8539a9c4d8cc80a15fdf5 (diff) | |
| download | FreeBSD-src-f97bf23fd9af2de32e50125c0c9b7b656bd22fb2.zip FreeBSD-src-f97bf23fd9af2de32e50125c0c9b7b656bd22fb2.tar.gz | |
Updates to the iwn driver:
* iwnfw has now been split into individual modules so autoloading of
firmware module(s) does work again.
* Changes have been made to RUN -> AUTH transition, this should fix the
issue reported by Glen and others.
* Brandon reported issues in iwn_cmd() with large commands, those have
been fixed to.
* DEAUTH is now handled correctly.
Submitted by: Bernhard Schmidt <bschmidt at techwires.net>
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/iwnfw/Makefile | 22 | ||||
| -rw-r--r-- | sys/modules/iwnfw/Makefile.inc | 13 | ||||
| -rw-r--r-- | sys/modules/iwnfw/iwn4965/Makefile | 6 | ||||
| -rw-r--r-- | sys/modules/iwnfw/iwn5000/Makefile | 6 | ||||
| -rw-r--r-- | sys/modules/iwnfw/iwn5150/Makefile | 6 |
5 files changed, 33 insertions, 20 deletions
diff --git a/sys/modules/iwnfw/Makefile b/sys/modules/iwnfw/Makefile index ee5e90f..8d260b7 100644 --- a/sys/modules/iwnfw/Makefile +++ b/sys/modules/iwnfw/Makefile @@ -1,23 +1,5 @@ # $FreeBSD$ -FWDIR= ${.CURDIR}/../../contrib/dev/iwn -.PATH: ${FWDIR} +SUBDIR= iwn4965 iwn5000 iwn5150 -KMOD= iwnfw -FIRMWS= iwlwifi-4965-228.57.2.23.fw:iwnfw-4965:22857223 \ - iwlwifi-5000-5.4.A.11.fw:iwnfw-5000:54A11 \ - iwlwifi-5150-8.24.2.2.fw:iwnfw-5150:82422 - -CLEANFILES= iwlwifi-4965-228.57.2.23.fw iwlwifi-5000-5.4.A.11.fw \ - iwlwifi-5150-8.24.2.2.fw - -iwlwifi-4965-228.57.2.23.fw: ${FWDIR}/iwlwifi-4965-228.57.2.23.fw.uu - uudecode -p ${FWDIR}/iwlwifi-4965-228.57.2.23.fw.uu > ${.TARGET} - -iwlwifi-5000-5.4.A.11.fw: ${FWDIR}/iwlwifi-5000-5.4.A.11.fw.uu - uudecode -p ${FWDIR}/iwlwifi-5000-5.4.A.11.fw.uu > ${.TARGET} - -iwlwifi-5150-8.24.2.2.fw: ${FWDIR}/iwlwifi-5150-8.24.2.2.fw.uu - uudecode -p ${FWDIR}/iwlwifi-5150-8.24.2.2.fw.uu > ${.TARGET} - -.include <bsd.kmod.mk> +.include <bsd.subdir.mk> diff --git a/sys/modules/iwnfw/Makefile.inc b/sys/modules/iwnfw/Makefile.inc new file mode 100644 index 0000000..73fe67e --- /dev/null +++ b/sys/modules/iwnfw/Makefile.inc @@ -0,0 +1,13 @@ +# $FreeBSD$ +# +# Common rules for building firmware. Note this gets auto-included +# by the subdir Makefile's as a consequence of included bsd.kmod.mk. + +_FIRM= ${IMG}.fw + +CLEANFILES+= ${_FIRM} + +FIRMWS= ${_FIRM}:${KMOD} + +${_FIRM}: ${.CURDIR}/../../../contrib/dev/iwn/${_FIRM}.uu + uudecode -p $? > ${.TARGET} diff --git a/sys/modules/iwnfw/iwn4965/Makefile b/sys/modules/iwnfw/iwn4965/Makefile new file mode 100644 index 0000000..6e88f8e --- /dev/null +++ b/sys/modules/iwnfw/iwn4965/Makefile @@ -0,0 +1,6 @@ +# $FreeBSD$ + +KMOD= iwn4965fw +IMG= iwlwifi-4965-228.57.2.23 + +.include <bsd.kmod.mk> diff --git a/sys/modules/iwnfw/iwn5000/Makefile b/sys/modules/iwnfw/iwn5000/Makefile new file mode 100644 index 0000000..88e9e99 --- /dev/null +++ b/sys/modules/iwnfw/iwn5000/Makefile @@ -0,0 +1,6 @@ +# $FreeBSD$ + +KMOD= iwn5000fw +IMG= iwlwifi-5000-5.4.A.11 + +.include <bsd.kmod.mk> diff --git a/sys/modules/iwnfw/iwn5150/Makefile b/sys/modules/iwnfw/iwn5150/Makefile new file mode 100644 index 0000000..5eeea79 --- /dev/null +++ b/sys/modules/iwnfw/iwn5150/Makefile @@ -0,0 +1,6 @@ +# $FreeBSD$ + +KMOD= iwn5150fw +IMG= iwlwifi-5150-8.24.2.2 + +.include <bsd.kmod.mk> |
