From 63f9a4cb2684a303e3eb2ffed39c03a2e2b28ae0 Mon Sep 17 00:00:00 2001 From: Sam Leffler Date: Wed, 8 Dec 2004 17:38:38 +0000 Subject: [PATCH] Update/new modules for net80211 and ath changes. --- sys/modules/Makefile | 6 ++++ sys/modules/ath_hal/Makefile | 6 ++-- sys/modules/ath_rate_amrr/Makefile | 48 ++++++++++++++++++++++++++++++ sys/modules/ath_rate_onoe/Makefile | 48 ++++++++++++++++++++++++++++++ sys/modules/wlan/Makefile | 3 +- sys/modules/wlan_acl/Makefile | 8 +++++ sys/modules/wlan_ccmp/Makefile | 8 +++++ sys/modules/wlan_tkip/Makefile | 8 +++++ sys/modules/wlan_wep/Makefile | 8 +++++ sys/modules/wlan_xauth/Makefile | 8 +++++ 10 files changed, 148 insertions(+), 3 deletions(-) create mode 100644 sys/modules/ath_rate_amrr/Makefile create mode 100644 sys/modules/ath_rate_onoe/Makefile create mode 100644 sys/modules/wlan_acl/Makefile create mode 100644 sys/modules/wlan_ccmp/Makefile create mode 100644 sys/modules/wlan_tkip/Makefile create mode 100644 sys/modules/wlan_wep/Makefile create mode 100644 sys/modules/wlan_xauth/Makefile diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 48bec3c07197..0e7a48264f98 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -26,6 +26,8 @@ SUBDIR= ${_3dfx} \ ${_asr} \ ath \ ${_ath_hal} \ + ath_rate_amrr \ + ath_rate_onoe \ aue \ ${_auxio} \ ${_awi} \ @@ -249,6 +251,10 @@ SUBDIR= ${_3dfx} \ wb \ ${_wi} \ wlan \ + wlan_ccmp \ + wlan_tkip \ + wlan_wep \ + wlan_xauth \ ${_xe} \ xl diff --git a/sys/modules/ath_hal/Makefile b/sys/modules/ath_hal/Makefile index a47541d75693..ac45d354dce3 100644 --- a/sys/modules/ath_hal/Makefile +++ b/sys/modules/ath_hal/Makefile @@ -61,8 +61,10 @@ CFLAGS+= -I. -I${HAL}/freebsd -I${HAL} .include "${HAL}/freebsd/Makefile.inc" .else -hal.o: ${HAL}/freebsd/i386-elf.hal.o.uu - uudecode -p < ${HAL}/freebsd/i386-elf.hal.o.uu > ${.TARGET} +hal.o: ${HAL}/public/i386-elf.hal.o.uu + uudecode -p < ${HAL}/public/i386-elf.hal.o.uu > ${.TARGET} +opt_ah.h: ${HAL}/public/i386-elf.opt_ah.h + cp ${HAL}/public/i386-elf.opt_ah.h ${.TARGET} .endif .include diff --git a/sys/modules/ath_rate_amrr/Makefile b/sys/modules/ath_rate_amrr/Makefile new file mode 100644 index 000000000000..22f16d2d2213 --- /dev/null +++ b/sys/modules/ath_rate_amrr/Makefile @@ -0,0 +1,48 @@ +# +# Copyright (c) 2004 Sam Leffler, Errno Consulting +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer, +# without modification. +# 2. Redistributions in binary form must reproduce at minimum a disclaimer +# similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any +# redistribution must be conditioned upon including a substantially +# similar Disclaimer requirement for further binary redistribution. +# 3. Neither the names of the above-listed copyright holders nor the names +# of any contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# Alternatively, this software may be distributed under the terms of the +# GNU General Public License ("GPL") version 2 as published by the Free +# Software Foundation. +# +# NO WARRANTY +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY +# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +# THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, +# OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +# THE POSSIBILITY OF SUCH DAMAGES. +# +# $FreeBSD$ +# + +.PATH: ${.CURDIR}/../../dev/ath/ath_rate/amrr + +KMOD= ath_rate +SRCS= amrr.c +SRCS+= opt_bdg.h device_if.h bus_if.h pci_if.h opt_inet.h + +HAL= ${.CURDIR}/../../contrib/dev/ath +CFLAGS+= -I. -I${HAL}/freebsd -I${HAL} + +.include diff --git a/sys/modules/ath_rate_onoe/Makefile b/sys/modules/ath_rate_onoe/Makefile new file mode 100644 index 000000000000..e404e4b48725 --- /dev/null +++ b/sys/modules/ath_rate_onoe/Makefile @@ -0,0 +1,48 @@ +# +# Copyright (c) 2004 Sam Leffler, Errno Consulting +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer, +# without modification. +# 2. Redistributions in binary form must reproduce at minimum a disclaimer +# similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any +# redistribution must be conditioned upon including a substantially +# similar Disclaimer requirement for further binary redistribution. +# 3. Neither the names of the above-listed copyright holders nor the names +# of any contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# Alternatively, this software may be distributed under the terms of the +# GNU General Public License ("GPL") version 2 as published by the Free +# Software Foundation. +# +# NO WARRANTY +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY +# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +# THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, +# OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +# THE POSSIBILITY OF SUCH DAMAGES. +# +# $FreeBSD$ +# + +.PATH: ${.CURDIR}/../../dev/ath/ath_rate/onoe + +KMOD= ath_rate +SRCS= onoe.c +SRCS+= opt_bdg.h device_if.h bus_if.h pci_if.h opt_inet.h + +HAL= ${.CURDIR}/../../contrib/dev/ath +CFLAGS+= -I. -I${HAL}/freebsd -I${HAL} + +.include diff --git a/sys/modules/wlan/Makefile b/sys/modules/wlan/Makefile index d2aa5c7dce73..f37ba4420e01 100644 --- a/sys/modules/wlan/Makefile +++ b/sys/modules/wlan/Makefile @@ -3,7 +3,8 @@ .PATH: ${.CURDIR}/../../net80211 KMOD= wlan -SRCS= ieee80211.c ieee80211_crypto.c ieee80211_input.c ieee80211_ioctl.c \ +SRCS= ieee80211.c ieee80211_crypto.c ieee80211_crypto_none.c \ + ieee80211_freebsd.c ieee80211_input.c ieee80211_ioctl.c \ ieee80211_node.c ieee80211_output.c ieee80211_proto.c SRCS+= bus_if.h device_if.h opt_inet.h opt_ipx.h diff --git a/sys/modules/wlan_acl/Makefile b/sys/modules/wlan_acl/Makefile new file mode 100644 index 000000000000..aa71de2eebf8 --- /dev/null +++ b/sys/modules/wlan_acl/Makefile @@ -0,0 +1,8 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../net80211 + +KMOD= wlan_acl +SRCS= ieee80211_acl.c + +.include diff --git a/sys/modules/wlan_ccmp/Makefile b/sys/modules/wlan_ccmp/Makefile new file mode 100644 index 000000000000..d43130e7c025 --- /dev/null +++ b/sys/modules/wlan_ccmp/Makefile @@ -0,0 +1,8 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../net80211 + +KMOD= wlan_ccmp +SRCS= ieee80211_crypto_ccmp.c + +.include diff --git a/sys/modules/wlan_tkip/Makefile b/sys/modules/wlan_tkip/Makefile new file mode 100644 index 000000000000..1449b78479e0 --- /dev/null +++ b/sys/modules/wlan_tkip/Makefile @@ -0,0 +1,8 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../net80211 + +KMOD= wlan_tkip +SRCS= ieee80211_crypto_tkip.c + +.include diff --git a/sys/modules/wlan_wep/Makefile b/sys/modules/wlan_wep/Makefile new file mode 100644 index 000000000000..88ad322bb5e7 --- /dev/null +++ b/sys/modules/wlan_wep/Makefile @@ -0,0 +1,8 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../net80211 + +KMOD= wlan_wep +SRCS= ieee80211_crypto_wep.c + +.include diff --git a/sys/modules/wlan_xauth/Makefile b/sys/modules/wlan_xauth/Makefile new file mode 100644 index 000000000000..fba6f8aabb46 --- /dev/null +++ b/sys/modules/wlan_xauth/Makefile @@ -0,0 +1,8 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../net80211 + +KMOD= wlan_xauth +SRCS= ieee80211_xauth.c + +.include