Hello community,
here is the log from the commit of package madwifi
checked in at Thu May 25 00:47:13 CEST 2006.
--------
--- arch/i386/madwifi/madwifi.changes 2006-03-24 15:20:50.000000000 +0100
+++ madwifi/madwifi.changes 2006-05-25 00:01:02.000000000 +0200
@@ -1,0 +2,35 @@
+Wed May 24 16:48:07 CEST 2006 - jg@suse.de
+
+- disabled scanning when associated (bug 153733)
+- update to version 0.9.0, changes (shortened):
+ * Fix the remaining radiotap issues
+ * Add support for showing iwlist supported events
+ * Fix segmentation fault when switching XR mode off
+ * don't retry control frames that were injected
+ * remove bogosity where the byte order is found from the hal
+ include files
+ * Prevent the 802.11 stack numbering channels outside the 802.11
+ specifications
+ * Implement wireless extension (WEXT) > 18 ioctl's
+ * Use IWEVGENIE to report IEs for RSN and WPA in a human readabe
+ form
+ * Make wlanconfig slightly more vebose and less forgiving
+ * Fixed up some vap->iv_xrvap checks
+ * SMP/PREEMPTIBLE fixes
+ * Export module version information
+ * Fix some duplicate node errors by always finding old nodes
+ before allocating
+ * wext 19 fixes
+ * Solve a deadlock problem between user-context and tasklet
+ for IEEE80211_VAPS_LOCK
+ * Fix+update athdebug
+ * Enable use of QoS and short preamble in adhoc demo mode
+ * Time out nodes in ibss and adhoc demo modes
+ * honor retries for packet injection
+ * Fix issues with AR5211 cards when associating to a 802.11b/g AP
+ * Move the interface unit checks to wlanconfig
+ * do not ignore turbo channels if turbo on
+ * add the id map for sonicwall card
+ * Fix include directory for compat.h
+
+-------------------------------------------------------------------
Old:
----
madwifi-arphrd.dif
madwifi-enc-capa.patch
madwifi-ng-r1468-20060309.tar.bz2
New:
----
madwifi-0.9.0.tar.bz2
madwifi-disable_assoc_scan.dif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ madwifi.spec ++++++
--- /var/tmp/diff_new_pack.wJ24Fc/_old 2006-05-25 00:46:48.000000000 +0200
+++ /var/tmp/diff_new_pack.wJ24Fc/_new 2006-05-25 00:46:48.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package madwifi (Version 1468)
+# spec file for package madwifi (Version 0.9.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,26 +12,25 @@
Name: madwifi
BuildRequires: kernel-source kernel-syms sharutils
-%define madwifi_version r1468-20060309
-Summary: Tools for a configuring atheros cards
-Version: 1468
-Release: 8
+%define madwifi_version 0.9.0
+Summary: Tools for configuring atheros cards
+Version: 0.9.0
+Release: 1
Group: Hardware/Other
-License: BSD, GPL
+License: BSD
BuildRoot: %{_tmppath}/%{name}-%{version}-build
URL: http://madwifi.org/
Autoreqprov: on
-Source: madwifi-ng-%{madwifi_version}.tar.bz2
+Source: madwifi-%{madwifi_version}.tar.bz2
Patch: madwifi.dif
Patch2: madwifi-active_scan.dif
-Patch3: madwifi-enc-capa.patch
Patch4: madwifi-len_check.dif
-Patch5: madwifi-arphrd.dif
+Patch5: madwifi-disable_assoc_scan.dif
ExclusiveArch: %ix86 x86_64
%suse_kernel_module_package -n madwifi kdump um
%description
-Tools for a configuring atheros cards
+Tools for configuring atheros cards
@@ -42,11 +41,11 @@
%package devel
Group: Hardware/Other
-License: Unknown, LGPL
-Summary: Tools for a configuring atheros cards
+License: BSD
+Summary: Tools for configuring atheros cards
%description devel
-Tools for a configuring atheros cards
+Tools for configuring atheros cards
@@ -57,7 +56,7 @@
%package -n madwifi-KMP
Group: System/Kernel
-License: GPL, Contact author
+License: Other License(s), see package, BSD
Summary: kernel modules for atheros cards
%description -n madwifi-KMP
@@ -71,10 +70,9 @@
Greg Chesson (madwifi)
%prep
-%setup -n madwifi-ng-%{madwifi_version}
+%setup -n madwifi-%{madwifi_version}
%patch0 -p1
%patch2 -p1
-%patch3 -p1
%patch4 -p0
%patch5 -p1
echo "#define SVNVERSION \"%{version}\"" > svnversion.h
@@ -87,7 +85,7 @@
mkdir -p obj
for flavor in %flavors_to_build; do
rm -rf obj/$flavor
- cp -r madwifi-ng-%{madwifi_version} obj/$flavor
+ cp -r madwifi-%{madwifi_version} obj/$flavor
make -C /usr/src/linux-obj/%_target_cpu/$flavor modules \
M=$PWD/obj/$flavor
done
@@ -120,6 +118,38 @@
%{_includedir}/%{name}-%{version}
%changelog -n madwifi
+* Wed May 24 2006 - jg@suse.de
+- disabled scanning when associated (bug 153733)
+- update to version 0.9.0, changes (shortened):
+ * Fix the remaining radiotap issues
+ * Add support for showing iwlist supported events
+ * Fix segmentation fault when switching XR mode off
+ * don't retry control frames that were injected
+ * remove bogosity where the byte order is found from the hal
+ include files
+ * Prevent the 802.11 stack numbering channels outside the 802.11
+ specifications
+ * Implement wireless extension (WEXT) > 18 ioctl's
+ * Use IWEVGENIE to report IEs for RSN and WPA in a human readabe
+ form
+ * Make wlanconfig slightly more vebose and less forgiving
+ * Fixed up some vap->iv_xrvap checks
+ * SMP/PREEMPTIBLE fixes
+ * Export module version information
+ * Fix some duplicate node errors by always finding old nodes
+ before allocating
+ * wext 19 fixes
+ * Solve a deadlock problem between user-context and tasklet
+ for IEEE80211_VAPS_LOCK
+ * Fix+update athdebug
+ * Enable use of QoS and short preamble in adhoc demo mode
+ * Time out nodes in ibss and adhoc demo modes
+ * honor retries for packet injection
+ * Fix issues with AR5211 cards when associating to a 802.11b/g AP
+ * Move the interface unit checks to wlanconfig
+ * do not ignore turbo channels if turbo on
+ * add the id map for sonicwall card
+ * Fix include directory for compat.h
* Fri Mar 24 2006 - agruen@suse.de
- Cleanups in the spec file.
* Thu Mar 09 2006 - jg@suse.de
++++++ madwifi-ng-r1468-20060309.tar.bz2 -> madwifi-0.9.0.tar.bz2 ++++++
++++ 8363 lines of diff (skipped)
++++++ madwifi-disable_assoc_scan.dif ++++++
Index: madwifi-ng-r1560-20060519/net80211/ieee80211_scan.c
===================================================================
--- madwifi-ng-r1560-20060519.orig/net80211/ieee80211_scan.c
+++ madwifi-ng-r1560-20060519/net80211/ieee80211_scan.c
@@ -324,6 +324,9 @@ scan_restart(struct scan_state *ss, u_in
}
if (vap->iv_opmode == IEEE80211_M_STA &&
vap->iv_state == IEEE80211_S_RUN) {
+ IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
+ "%s: associated, not scanning\n", __func__);
+ return 0;
if ((vap->iv_bss->ni_flags & IEEE80211_NODE_PWR_MGT) == 0) {
/*
* Initiate power save before going off-channel.
++++++ madwifi.dif ++++++
--- /var/tmp/diff_new_pack.wJ24Fc/_old 2006-05-25 00:46:55.000000000 +0200
+++ /var/tmp/diff_new_pack.wJ24Fc/_new 2006-05-25 00:46:55.000000000 +0200
@@ -1,8 +1,8 @@
-Index: madwifi-ng-r1462-20060307/net80211/Makefile
+Index: madwifi-ng-0.9.0/net80211/Makefile
===================================================================
---- madwifi-ng-r1462-20060307.orig/net80211/Makefile
-+++ madwifi-ng-r1462-20060307/net80211/Makefile
-@@ -1,50 +1,7 @@
+--- madwifi-ng-0.9.0.orig/net80211/Makefile
++++ madwifi-ng-0.9.0/net80211/Makefile
+@@ -1,71 +1,6 @@
-#
-# Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
-# All rights reserved.
@@ -48,27 +48,40 @@
-ifeq ($(obj),)
-obj= .
-endif
-+-include $(ROOT)/Makefile.inc
-
+-
-DEPTH= ..
-#
- # There are two authenticator mechanisms: an in-kernel implementation
- # (wlan_auth+wlan_radius) and an external implementation (wlan_xauth) that
- # requires a user process to manage the authentication process. By default
-@@ -81,53 +38,4 @@ wlan_xauth-objs := ieee80211_xauth.o
+-# There are two authenticator mechanisms: an in-kernel implementation
+-# (wlan_auth+wlan_radius) and an external implementation (wlan_xauth) that
+-# requires a user process to manage the authentication process. By default
+-# the external authenticator is used. ieee80211_proto.c has a table of module
+-# names that defines the default module to auto-load for each authentication
+-# scheme; to get the in-kernel authenticator by default modify it to load
+-# wlan_auth instead of wlan_xauth or manually load wlan_auth prior to use.
+-#
+-MOD_AUTH := wlan_xauth.o
+-#
+-# Scanning policy is split into modules. The default policy modules
+-# separate station-mode scanning support from ap-mode scanning support.
+-#
+-MOD_SCAN := wlan_scan_sta.o wlan_scan_ap.o
+-#
+-# Modules to be built+installed
+-#
+-MOD_INSTALL := wlan.o wlan_wep.o wlan_tkip.o wlan_ccmp.o wlan_acl.o \
+- $(MOD_AUTH) $(MOD_SCAN)
+-
+-obj-m += $(MOD_INSTALL)
++-include $(ROOT)/Makefile.inc
+
+ wlan-objs := if_media.o \
+ ieee80211.o ieee80211_beacon.o ieee80211_crypto.o \
+@@ -80,45 +15,3 @@ wlan_acl-objs := ieee80211_acl.o
+ wlan_xauth-objs := ieee80211_xauth.o
wlan_scan_sta-objs :=ieee80211_scan_sta.o
wlan_scan_ap-objs := ieee80211_scan_ap.o
-
+-
-include $(obj)/${DEPTH}/Makefile.inc
-
--# If building into kernel
--# We only have one target, so all modules go into it I guess?
--ifneq ($(MAKING_MODULES),1)
--obj-$(CONFIG_NET80211) += $(MOD_INSTALL)
--ifdef LINUX24
--O_TARGET := net80211.o
--endif
--endif
-
-INCS+= -I${HAL} -I${HAL}/${OS} -I$(obj)/${ATH_HAL} -I$(obj)/${WLAN} \
- -I${obj}/${DEPTH}
@@ -109,11 +122,11 @@
- -rm -f *~ *.o *.ko *.mod.c
- -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
- -rm -rf .tmp_versions
-Index: madwifi-ng-r1462-20060307/ath_rate/onoe/Makefile
+Index: madwifi-ng-0.9.0/ath_rate/onoe/Makefile
===================================================================
---- madwifi-ng-r1462-20060307.orig/ath_rate/onoe/Makefile
-+++ madwifi-ng-r1462-20060307/ath_rate/onoe/Makefile
-@@ -1,82 +1,6 @@
+--- madwifi-ng-0.9.0.orig/ath_rate/onoe/Makefile
++++ madwifi-ng-0.9.0/ath_rate/onoe/Makefile
+@@ -1,75 +1,6 @@
-#
-# Copyright (c) 2004 Sam Leffler, Errno Consulting
-# Copyright (c) 2004 Video54 Technologies, Inc.
@@ -169,13 +182,6 @@
-
-include $(obj)/${DEPTH}/Makefile.inc
-
--ifneq ($(MAKING_MODULES),1)
--obj-$(CONFIG_RATE_ONOE) := $(ath_rate_onoe-objs)
--ifdef LINUX24
--O_TARGET := $(obj-m)
--endif
--endif
--
-INCS+= -I${HAL} -I${HAL}/${OS} -I${obj}/${ATH} -I${obj}/${WLAN} \
- -I${obj}/${DEPTH}
-
@@ -198,11 +204,11 @@
-
-ath_rate_onoe.o: ${ath_rate_onoe-objs}
- $(LD) $(LDOPTS) -o ath_rate_onoe.$(KMODSUF) -r $(ath_rate_onoe-objs)
-Index: madwifi-ng-r1462-20060307/ath_rate/amrr/Makefile
+Index: madwifi-ng-0.9.0/ath_rate/amrr/Makefile
===================================================================
---- madwifi-ng-r1462-20060307.orig/ath_rate/amrr/Makefile
-+++ madwifi-ng-r1462-20060307/ath_rate/amrr/Makefile
-@@ -1,82 +1,6 @@
+--- madwifi-ng-0.9.0.orig/ath_rate/amrr/Makefile
++++ madwifi-ng-0.9.0/ath_rate/amrr/Makefile
+@@ -1,75 +1,6 @@
-#
-# Copyright (c) 2004 Sam Leffler, Errno Consulting
-# Copyright (c) 2004 Video54 Technologies, Inc.
@@ -258,13 +264,6 @@
-
-include $(obj)/${DEPTH}/Makefile.inc
-
--ifneq ($(MAKING_MODULES),1)
--obj-$(CONFIG_RATE_AMRR) := $(ath_rate_amrr-objs)
--ifdef LINUX24
--O_TARGET := $(obj-m)
--endif
--endif
--
-INCS+= -I${HAL} -I${HAL}/${OS} -I${obj}/${ATH} -I${obj}/${WLAN} \
- -I${obj}/${DEPTH}
-
@@ -287,11 +286,11 @@
-
-ath_rate_amrr.o: ${ath_rate_amrr-objs}
- $(LD) $(LDOPTS) -o ath_rate_amrr.$(KMODSUF) -r $(ath_rate_amrr-objs)
-Index: madwifi-ng-r1462-20060307/ath_hal/Makefile
+Index: madwifi-ng-0.9.0/ath_hal/Makefile
===================================================================
---- madwifi-ng-r1462-20060307.orig/ath_hal/Makefile
-+++ madwifi-ng-r1462-20060307/ath_hal/Makefile
-@@ -1,89 +1,17 @@
+--- madwifi-ng-0.9.0.orig/ath_hal/Makefile
++++ madwifi-ng-0.9.0/ath_hal/Makefile
+@@ -1,87 +1,17 @@
-# $Id: //depot/sw/linuxsrc/src/802_11/madwifi/madwifi/ath_hal/Makefile#9 $
-#
-# Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -331,21 +330,16 @@
+ROOT=$(src)/..
-DEPTH= ..
+-
+-include $(obj)/${DEPTH}/Makefile.inc
+-include $(ROOT)/Makefile.inc
obj-m += ath_hal.o
- ath_hal-objs := ah_osdep.o hal.o
-
--include $(obj)/${DEPTH}/Makefile.inc
-
--# If building into kernel
+ ath_hal-objs := ah_osdep.o ${TARGET}.hal.o
+-hostprogs-y := uudecode
-
--ifneq ($(MAKING_MODULES),1)
--obj-$(CONFIG_ATHEROS_HAL) := ah_osdep.o hal.o
--ifdef LINUX24
--O_TARGET := ath_hal.o
--endif
--endif
+-# For older 2.6 kernels
+-host-progs := $(hostprogs-y)
-
-ifdef LINUX24
-export-objs := ah_osdep.o
@@ -357,20 +351,24 @@
-
--include $(TOPDIR)/Rules.make
-
--all: ah_osdep.c hal.o opt_ah.h
+-all: opt_ah.h
- $(MAKE) -C $(KERNELPATH) SUBDIRS=$(shell pwd) MODVERDIR=$(shell pwd)/${SYMBOLSDIR} modules
-
--ah_osdep.c: opt_ah.h
-- cp -f ${HAL}/${OS}/ah_osdep.c ah_osdep.c
-+$(src)/ah_osdep.c: $(src)/opt_ah.h
-+ cp -f $(ROOT)/hal/linux/ah_osdep.c $(src)/ah_osdep.c
+-ifdef LINUX24
+-$(obj)/uudecode: $(obj)/uudecode.c
+- $(HOSTCC) $(HOSTCFLAGS) -o $@ $<
+-endif
+
+-$(obj)/${TARGET}.hal.o: ${HAL}/public/${TARGET}.hal.o.uu $(obj)/uudecode
++$(obj)/${TARGET}.hal.o: $(ROOT)/hal/public/${TARGET}.hal.o.uu
+ echo "deps_$@ :=" >$(@D)/.$(@F).cmd
+- $(obj)/uudecode -o $@ $<
++ uudecode -o $@ $<
- $(obj)/hal.o:
-- ${UUDECODE} ${HAL}/public/${TARGET}.hal.o.uu
--
-opt_ah.h: ${HAL}/public/${TARGET}.opt_ah.h
- cp -f ${HAL}/public/${TARGET}.opt_ah.h opt_ah.h
-+ uudecode -o $(obj)/hal.o $(ROOT)/hal/public/${TARGET}.hal.o.uu
++$(src)/ah_osdep.c: $(src)/opt_ah.h
++ cp -f $(ROOT)/hal/linux/ah_osdep.c $(src)/ah_osdep.c
-install:
- test -d ${DESTDIR}/${MODULEPATH} || mkdir -p ${DESTDIR}/${MODULEPATH}
@@ -378,20 +376,20 @@
- cp ath_hal.${KMODSUF} ${DESTDIR}/${MODULEPATH}
-
-clean:
-- -rm -f *~ *.o *.ko *.mod.c
+- -rm -f *~ *.o *.ko *.mod.c uudecode .uudecode.cmd
- -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
- -rm -rf .tmp_versions
-# remove the files we copied to this dir
-- -rm -f ah_osdep.c opt_ah.h hal.o
+- -rm -f opt_ah.h
+$(src)/opt_ah.h: $(ROOT)/hal/public/${TARGET}.opt_ah.h
+ cp -f $(ROOT)/hal/public/${TARGET}.opt_ah.h $(src)/opt_ah.h
-ath_hal.o: ${ath_hal-objs}
- $(LD) $(LDOPTS) -o ath_hal.$(KMODSUF) -r $(ath_hal-objs)
-Index: madwifi-ng-r1462-20060307/tools/Makefile
+Index: madwifi-ng-0.9.0/tools/Makefile
===================================================================
---- madwifi-ng-r1462-20060307.orig/tools/Makefile
-+++ madwifi-ng-r1462-20060307/tools/Makefile
+--- madwifi-ng-0.9.0.orig/tools/Makefile
++++ madwifi-ng-0.9.0/tools/Makefile
@@ -32,19 +32,7 @@ DEPTH= ..
# it's a more traditional name.
TOOLPREFIX ?= $(CROSS_COMPILE)
@@ -432,11 +430,11 @@
done
install -d ${DESTDIR}${MANDIR}/man8
install -m 0644 man/*.8 ${DESTDIR}${MANDIR}/man8
-Index: madwifi-ng-r1462-20060307/ath/Makefile
+Index: madwifi-ng-0.9.0/ath/Makefile
===================================================================
---- madwifi-ng-r1462-20060307.orig/ath/Makefile
-+++ madwifi-ng-r1462-20060307/ath/Makefile
-@@ -1,92 +1,7 @@
+--- madwifi-ng-0.9.0.orig/ath/Makefile
++++ madwifi-ng-0.9.0/ath/Makefile
+@@ -1,83 +1,7 @@
-#
-# Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
-# All rights reserved.
@@ -502,15 +500,6 @@
-obj-m += ath_${BUSNAME}.o
-ath_${BUSNAME}-objs := if_ath.o if_ath_${BUSNAME}.o
-
--# If building into kernel
--
--ifneq ($(MAKING_MODULES),1)
--obj-$(CONFIG_ATHEROS) := $(ath_${BUSNAME}-objs)
--ifdef LINUX24
--O_TARGET := $(obj-m)
--endif
--endif
--
-INCS+= -I${HAL} -I${HAL}/${OS} -I${obj}/${ATH_HAL} \
- -I${obj}/${WLAN} -I${obj}/${DEPTH}
-
@@ -533,11 +522,11 @@
-
-ath_${BUSNAME}.o: ${ath_${BUSNAME}-objs}
- $(LD) $(LDOPTS) -o ath_${BUSNAME}.$(KMODSUF) -r $(ath_${BUSNAME}-objs)
-Index: madwifi-ng-r1462-20060307/Makefile
+Index: madwifi-ng-0.9.0/Makefile
===================================================================
---- madwifi-ng-r1462-20060307.orig/Makefile
-+++ madwifi-ng-r1462-20060307/Makefile
-@@ -1,190 +1,7 @@
+--- madwifi-ng-0.9.0.orig/Makefile
++++ madwifi-ng-0.9.0/Makefile
+@@ -1,175 +1,7 @@
-#
-# Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
-# All rights reserved.
@@ -581,18 +570,17 @@
-#
-DEPTH= .
-
--# release tag versioning
---include $(KERNELPATH)/ath_version.mk
--export EXTRAVERSION
--
-include Makefile.inc
-
-# NB: the order is important here
-DIRS_MODULES= ${ATH_HAL} ${WLAN} ${ATH_RATE} ${ATH}
-
+-# export for make-release.bash
+-export ATH_HAL
+-
-all: modules tools
-
--modules: configcheck svnversion.h
+-modules: configcheck svnversion.h
- mkdir -p ${SYMBOLSDIR}
- for i in ${DIRS_MODULES}; do \
- $(MAKE) -C $$i || exit 1; \
@@ -600,15 +588,13 @@
-
-.PHONY: svnversion.h
-svnversion.h:
-- echo -n '#define SVNVERSION "' > $@
- if [ -d .svn ]; then \
-- echo -n "$(shell svnversion -nc . | sed -e 's/^[^:]*://;s/[A-Za-z]//')" >> $@; \
+- ver=`svnversion -nc . | sed -e 's/^[^:]*://;s/[A-Za-z]//'`; \
+- echo "#define SVNVERSION \"svn r$$ver\"" > $@; \
- elif [ -s SNAPSHOT ]; then \
-- echo -n "$(shell sed -e '/^Revision: */!d;s///;q' SNAPSHOT)" >> $@; \
-- else \
-- echo -n "$(shell date +%F)" >> $@; \
-- fi
-- echo '"' >> $@
+- ver=`sed -e '/^Revision: */!d;s///;q' SNAPSHOT`; \
+- echo "#define SVNVERSION \"svn r$$ver\"" > $@; \
+- fi; \
-
-# conflicts with the 'tools' subdirectory
-.PHONY: tools
@@ -638,10 +624,6 @@
- sh scripts/find-madwifi-modules.sh $(DESTDIR)/lib/modules/$(KERNELRELEASE)
- $(MAKE) -C ${TOOLS} uninstall
-
--FILES= ath_hal COPYRIGHT ath include Makefile Makefile.inc \
-- README release.h share net80211 ath_rate
--HAL_TAG=ATH_HAL_20030802
--
-clean:
- for i in ${DIRS_MODULES}; do \
- $(MAKE) -C $$i clean; \
@@ -672,14 +654,6 @@
-sanitycheck:
- @echo -n "Checking requirements... "
-
-- @# check if kernel configuration file is available
-- @if [ ! -f $(KERNELCONF) ]; then \
-- echo "FAILED"; \
-- echo "'$(KERNELCONF)' not found."; \
-- echo "You need to configure your kernel."; \
-- exit 1; \
-- fi
--
- @# check if specified rate control is available
- @if [ ! -d $(ATH_RATE) ]; then \
- echo "FAILED"; \
@@ -687,16 +661,12 @@
- exit 1; \
- fi
-
-- @# see if uudecode is available
-- @if [ -z "$(UUDECODE)" ]; then \
-- echo "FAILED"; \
-- echo "The 'uudecode' tool was not found on your system. Please make sure"; \
-- echo "it is installed in your PATH, then try again."; \
-- exit 1; \
-- fi
--
- @echo "ok."
-
+-.PHONY: release
+-release:
+- sh scripts/make-release.bash
+-
-# new targets should be inserted ABOVE this line in order to avoid
-# problems with the included kernel configuration file below.
-include $(KERNELCONF)
@@ -706,7 +676,7 @@
-configcheck: sanitycheck
- @echo -n "Checking kernel configuration... "
-
-- @# check version of kernel and wireless.h
+- @# check version of kernel
- @echo $(KERNELRELEASE) | grep -q -i '^[2-9]\.[4-9]\.' || { \
- echo "FAILED"; \
- echo "Only kernel versions 2.4.x and above are supported."; \
@@ -720,11 +690,15 @@
- echo "Please enable sysctl support."; \
- exit 1; \
- fi
+-
+- @# check wireless extensions support is enabled
- @if [ -z "$(CONFIG_NET_RADIO)" ]; then \
- echo "FAILED"; \
- echo "Please enable wireless extensions."; \
- exit 1; \
- fi
+-
+- @# check crypto support is enabled
- @if [ -z "$(CONFIG_CRYPTO)" ]; then \
- echo "FAILED"; \
- echo "Please enable crypto API."; \
@@ -732,51 +706,11 @@
- fi
-
- @echo "ok."
-Index: madwifi-ng-r1462-20060307/tools/athstats.c
-===================================================================
---- madwifi-ng-r1462-20060307.orig/tools/athstats.c
-+++ madwifi-ng-r1462-20060307/tools/athstats.c
-@@ -57,6 +57,8 @@
- #include
- #include
- #include
-+#include
-+#include
-
- #define __user
-
-@@ -268,8 +270,7 @@ main(int argc, char *argv[])
- strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
- if (argc > 1) {
- u_long interval = strtoul(argv[1], NULL, 0);
-- int line;
-- sigset_t omask, nmask;
-+ int line, omask;
- u_int rate, rssi;
- struct ath_stats cur, total;
- u_long icur, ocur;
-@@ -341,13 +342,10 @@ main(int argc, char *argv[])
- rate);
- }
- fflush(stdout);
-- sigemptyset(&nmask);
-- sigaddset(&nmask,SIGALRM);
-- sigprocmask(SIG_BLOCK, &nmask, &omask);
-- sigemptyset(&nmask);
-+ omask = sigblock(sigmask(SIGALRM));
- if (!signalled)
-- sigsuspend(&nmask);
-- sigprocmask(SIG_SETMASK, &omask, NULL);
-+ sigpause(0);
-+ sigsetmask(omask);
- signalled = 0;
- alarm(interval);
- line++;
-Index: madwifi-ng-r1462-20060307/Makefile.inc
+Index: madwifi-ng-0.9.0/Makefile.inc
===================================================================
---- madwifi-ng-r1462-20060307.orig/Makefile.inc
-+++ madwifi-ng-r1462-20060307/Makefile.inc
-@@ -1,221 +1,11 @@
+--- madwifi-ng-0.9.0.orig/Makefile.inc
++++ madwifi-ng-0.9.0/Makefile.inc
+@@ -1,217 +1,14 @@
-#
-# Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
-# All rights reserved.
@@ -814,22 +748,14 @@
-#
-# $Id: //depot/sw/linuxsrc/src/802_11/madwifi/madwifi/Makefile.inc#11 $
-#
-+ROOT ?=.
-+TARGET ?= $(shell uname -m | sed -e s/i.86/i386/ -e s/ppc/powerpc-be/)-elf
-
+-
-ifeq ($(obj),)
-obj= .
-endif
-+-include $(ROOT)/hal/public/${TARGET}.inc
-+-include $(ROOT)/BuildCaps.inc
-
+-
-# other locales sometimes cause trouble
-export LC_ALL = POSIX
-+EXTRA_CFLAGS+= -I$(ROOT)/hal -I$(ROOT)/hal/linux -I$(ROOT)/ath_hal -I. -I$(ROOT) \
-+ -I$(ROOT)/net80211 -I$(ROOT)/ath -I$(ROOT)/include ${COPTS} \
-+ -include $(ROOT)/include/compat.h
-+EXTRA_CFLAGS+= -DATH_PCI
-
+-
-# OS is the target operating system. Currently only Linux is supported.
-OS= linux
-
@@ -875,20 +801,15 @@
-# The default KERNELPATH points to the directory where the currently
-# running kernel was compiled. Note that the configuration and the
-# version of the kernel tree might have changed since then.
--ifndef KERNELPATH
--ifeq ($(wildcard $(shell echo /lib/modules/`uname -r`/build)),)
--KERNELPATH = /usr/src/linux
--$(warning Default KERNELPATH not found, using $(KERNELPATH))
--else
--KERNELPATH := $(shell cd /lib/modules/`uname -r`/build && pwd)
--endif
+-ifeq ($(wildcard $(KERNELPATH)),)
+-KERNELPATH = /lib/modules/$(shell uname -r)/build
+-# sanity check: does KERNELPATH exist?
+-ifeq ($(shell cd $(KERNELPATH) && pwd),)
+-$(error $(KERNELPATH) is missing, please set KERNELPATH)
-endif
--
+-export KERNELPATH
-endif
-
--# sanity check: does KERNELPATH exist?
--ifeq ($(wildcard $(KERNELPATH)),)
--$(error KERNELPATH: $(KERNELPATH) does not exist)
-endif
-
-# KERNELRELEASE is the target kernel's version. It's always taken from
@@ -953,9 +874,9 @@
-
-NM= nm
-AWK= awk
--UUDECODE ?= $(shell which uudecode 2>/dev/null)
--
--
++ROOT ?= .
++TARGET ?= $(shell uname -m | sed -e s/i.86/i386/ -e s/ppc/powerpc-be/)-elf
+
-#
-# Path to the HAL source code.
-#
@@ -1001,16 +922,25 @@
-TARGETS=$(basename $(notdir $(wildcard ${HAL}/public/*.inc)))
-$(error TARGET $(TARGET) is invalid, valid targets are: $(TARGETS))
-endif
--
++-include $(ROOT)/hal/public/${TARGET}.inc
++-include $(ROOT)/BuildCaps.inc
+
-include ${HAL}/public/${TARGET}.inc
-include ${obj}/${DEPTH}/BuildCaps.inc
--
++EXTRA_CFLAGS+= -I$(ROOT)/hal -I$(ROOT)/hal/linux -I$(ROOT)/ath_hal -I. -I$(ROOT) \
++ -I$(ROOT)/net80211 -I$(ROOT)/ath -I$(ROOT)/include ${COPTS} \
++ -include $(ROOT)/include/compat.h
++EXTRA_CFLAGS+= -DATH_PCI
+
-SYMBOLSDIR=${DEPTH}/symbols
-Index: madwifi-ng-r1462-20060307/ath_rate/sample/Makefile
+
+
+ # The following variables will affect developers only, and are used in the
+Index: madwifi-ng-0.9.0/ath_rate/sample/Makefile
===================================================================
---- madwifi-ng-r1462-20060307.orig/ath_rate/sample/Makefile
-+++ madwifi-ng-r1462-20060307/ath_rate/sample/Makefile
-@@ -1,80 +1,7 @@
+--- madwifi-ng-0.9.0.orig/ath_rate/sample/Makefile
++++ madwifi-ng-0.9.0/ath_rate/sample/Makefile
+@@ -1,73 +1,6 @@
-#
-# Copyright (c) 2004 Sam Leffler, Errno Consulting
-# Copyright (c) 2004 Video54 Technologies, Inc.
@@ -1061,15 +991,8 @@
obj-m += ath_rate_sample.o
ath_rate_sample-objs := sample.o
-
--include $(obj)/${DEPTH}/Makefile.inc
-
--ifneq ($(MAKING_MODULES),1)
--obj-$(CONFIG_RATE_SAMPLE) := $(ath_rate_sample-objs)
--ifdef LINUX24
--O_TARGET := $(obj-m)
--endif
--endif
+-include $(obj)/${DEPTH}/Makefile.inc
-
-INCS+= -I${HAL} -I${HAL}/${OS} -I${obj}/${ATH} -I${obj}/${WLAN} \
- -I${obj}/${DEPTH}
@@ -1093,10 +1016,10 @@
-
-ath_rate_sample.o: ${ath_rate_sample-objs}
- $(LD) $(LDOPTS) -o ath_rate_sample.$(KMODSUF) -r $(ath_rate_sample-objs)
-Index: madwifi-ng-r1462-20060307/hal/public/x86_64-elf.inc
+Index: madwifi-ng-0.9.0/hal/public/x86_64-elf.inc
===================================================================
---- madwifi-ng-r1462-20060307.orig/hal/public/x86_64-elf.inc
-+++ madwifi-ng-r1462-20060307/hal/public/x86_64-elf.inc
+--- madwifi-ng-0.9.0.orig/hal/public/x86_64-elf.inc
++++ madwifi-ng-0.9.0/hal/public/x86_64-elf.inc
@@ -41,10 +41,6 @@
#
@@ -1108,10 +1031,10 @@
CC= ${TOOLPREFIX}gcc
LD= ${TOOLPREFIX}ld
STRIP= ${TOOLPREFIX}strip
-Index: madwifi-ng-r1462-20060307/hal/public/powerpc-be-elf.inc
+Index: madwifi-ng-0.9.0/hal/public/powerpc-be-elf.inc
===================================================================
---- madwifi-ng-r1462-20060307.orig/hal/public/powerpc-be-elf.inc
-+++ madwifi-ng-r1462-20060307/hal/public/powerpc-be-elf.inc
+--- madwifi-ng-0.9.0.orig/hal/public/powerpc-be-elf.inc
++++ madwifi-ng-0.9.0/hal/public/powerpc-be-elf.inc
@@ -51,10 +51,6 @@
# --enable-languages=c --with-gnu-as --with-gnu-ld \
# --with-newlib --with-gxx-include-dir=${PREFIX}/$target/include
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...