diff options
author | Nobody <nobody@nowhere> | 2010-05-12 17:43:45 +0200 |
---|---|---|
committer | Robby Workman <rworkman@slackbuilds.org> | 2010-05-12 17:43:45 +0200 |
commit | f5490957cedf7301009d08526552c2e9f2014c34 (patch) | |
tree | 2ccdf0e3fe596f6983b63a6f13a70d8ca4867638 /network/madwifi-driver | |
parent | f1879b9d17404495eec2731d93e43c211e5776c6 (diff) |
network/madwifi-driver: Updated for version 0.9.4
Diffstat (limited to 'network/madwifi-driver')
-rw-r--r-- | network/madwifi-driver/README | 41 | ||||
-rw-r--r-- | network/madwifi-driver/doinst.sh | 3 | ||||
-rw-r--r-- | network/madwifi-driver/madwifi-driver.SlackBuild | 50 | ||||
-rw-r--r-- | network/madwifi-driver/madwifi-driver.info | 6 | ||||
-rw-r--r-- | network/madwifi-driver/patches/madwifi-0.9.4_kernel_2.6.26.diff | 203 | ||||
-rw-r--r-- | network/madwifi-driver/patches/madwifi-0.9.4_kernel_2.6.27.diff | 159 | ||||
-rw-r--r-- | network/madwifi-driver/slack-desc | 9 |
7 files changed, 423 insertions, 48 deletions
diff --git a/network/madwifi-driver/README b/network/madwifi-driver/README index 8c2b6063743af..7038b3d452321 100644 --- a/network/madwifi-driver/README +++ b/network/madwifi-driver/README @@ -8,33 +8,28 @@ running kernel. If you would like to build the madwifi driver for a different kernel version, two things are required: 1) kernel source in /usr/src/linux-<version> 2) run the script as: KERNELVERSION=<version> sh madwifi-driver.SlackBuild -In place of <version> use only the version, not the full path. The <version> -string from 1) and 2) must be identical. - Example: KERNELVERSION=2.6.22.7 +In place of <version> use only the version as you would see from the output of +'uname -r' when running that kernel. Example: KERNELVERSION=2.6.27.10-smp + The kernel module will then be installed to /lib/modules/<version>/.... You may use this SlackBuild to build the madwifi module for as many *different* kernels as you like and they can be installed alongside each other without conflict. -Requirements: - Kernel requirements: - Linux Kernel 2.4.23+ or 2.6.x series - Kernel source and headers of running kernel - No module versioning support - option CONFIG_MODVERSIONS - Wireless Extensions support in kernel - v14+ required, v17+ recommended; option CONFIG_NET_RADIO - Sysctl support in kernel - option CONFIG_SYSCTL - Crypto API support in kernel - option CONFIG_CRYPTO - HMAC support - option CONFIG_CRYPTO_HMAC - AES support (for WPA networks) - option CONFIG_CRYPTO_AES + Linux Kernel 2.4.23+ or 2.6.x series + Kernel source and headers of running kernel + No module versioning support + option CONFIG_MODVERSIONS + Wireless Extensions support in kernel + v14+ required, v17+ recommended; option CONFIG_NET_RADIO + Sysctl support in kernel + option CONFIG_SYSCTL + Crypto API support in kernel + option CONFIG_CRYPTO + HMAC support + option CONFIG_CRYPTO_HMAC + AES support (for WPA networks) + option CONFIG_CRYPTO_AES -Requirements for configuring the wireless card: - madwifi-tools -- suite of tools designed specifically for madwifi-supported cards - iwconfig -- part of "wireless-tools" package in N series - wpa_supplicant -- for WPA encrypted networks - in N package series +This requires madwifi-tools from SlackBuilds.org. diff --git a/network/madwifi-driver/doinst.sh b/network/madwifi-driver/doinst.sh index bc367424f55cf..be06e3997f776 100644 --- a/network/madwifi-driver/doinst.sh +++ b/network/madwifi-driver/doinst.sh @@ -1,3 +1,2 @@ - -chroot . /sbin/depmod -ae +chroot . /sbin/depmod -ae _KERNEL_ diff --git a/network/madwifi-driver/madwifi-driver.SlackBuild b/network/madwifi-driver/madwifi-driver.SlackBuild index d5521e532f393..3e41964c967cd 100644 --- a/network/madwifi-driver/madwifi-driver.SlackBuild +++ b/network/madwifi-driver/madwifi-driver.SlackBuild @@ -4,44 +4,56 @@ ## Written by hollywoodb (hollywoodb@fastmail.fm) ## Maintained by Robby Workman <rworkman@slackbuilds.org> +## Modified by Larry Hajali <larryhaja[at]gmail[dot]com> KERNELVERSION=${KERNELVERSION:-$(uname -r)} KERNELPATH=${KERNELPATH:-/lib/modules/${KERNELVERSION}/build} -NAME=madwifi +PRGNAM=madwifi VERSION=0.9.4 +ARCH=${ARCH:-i486} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + PKG_NAME=madwifi-driver -PKG_VERS=$(echo ${VERSION}_$KERNELVERSION | tr '-' '_') +PKG_VERSION=$(echo ${VERSION}_$KERNELVERSION | tr '-' '_') -ARCH=${ARCH:-i486} CWD=$(pwd) TMP=${TMP:-/tmp/SBo} -PKG=${PKG:-$TMP/package-$NAME} +PKG=${PKG:-$TMP/package-$PKG_NAME} OUTPUT=${OUTPUT:-/tmp} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} + +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP || exit 1 -rm -rf $NAME-$VERSION -tar xvf $CWD/$NAME-$VERSION.tar.gz || exit 1 -cd $NAME-$VERSION || exit 1 +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . -KERNELPATH=$KERNELPATH KERNELRELEASE=$KERNELVERSION make modules || exit 1 -KERNELPATH=$KERNELPATH KERNELRELEASE=$KERNELVERSION make install-modules DESTDIR=$PKG || exit 1 +# Patches to build madwifi against Slacware 12.2 kernel +# Patch from: http://madwifi-project.org/changeset/3696 +patch -p1 < $CWD/patches/madwifi-0.9.4_kernel_2.6.26.diff +# Patch from: http://slackware.com/~alien/slackbuilds/madwifi/build/ +patch -p1 < $CWD/patches/madwifi-0.9.4_kernel_2.6.27.diff + +KERNELPATH=$KERNELPATH KERNELRELEASE=$KERNELVERSION \ + make modules +KERNELPATH=$KERNELPATH KERNELRELEASE=$KERNELVERSION \ + make install-modules DESTDIR=$PKG -mkdir -p $PKG/usr/doc/$PKG_NAME-$PKG_VERS -cp -a COPYRIGHT $PKG/usr/doc/$PKG_NAME-$PKG_VERS -cp -a hal/COPYRIGHT $PKG/usr/doc/$PKG_NAME-$PKG_VERS/COPYRIGHT.hal -cp -a hal/README $PKG/usr/doc/$PKG_NAME-$PKG_VERS/README.hal -cat $CWD/$PKG_NAME.SlackBuild > $PKG/usr/doc/$PKG_NAME-$PKG_VERS/$PKG_NAME.SlackBuild +mkdir -p $PKG/usr/doc/$PKG_NAME-$PKG_VERSION +cp -a COPYRIGHT $PKG/usr/doc/$PKG_NAME-$PKG_VERSION +cp -a hal/COPYRIGHT $PKG/usr/doc/$PKG_NAME-$PKG_VERSION/COPYRIGHT.hal +cp -a hal/README $PKG/usr/doc/$PKG_NAME-$PKG_VERSION/README.hal +cat $CWD/$PKG_NAME.SlackBuild > $PKG/usr/doc/$PKG_NAME-$PKG_VERSION/$PKG_NAME.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh +sed s/_KERNEL_/$KERNELVERSION/ $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PKG_NAME-$PKG_VERS-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD$TAG.tgz diff --git a/network/madwifi-driver/madwifi-driver.info b/network/madwifi-driver/madwifi-driver.info index dd78205a16b92..46c664087c6a8 100644 --- a/network/madwifi-driver/madwifi-driver.info +++ b/network/madwifi-driver/madwifi-driver.info @@ -3,6 +3,6 @@ VERSION="0.9.4" HOMEPAGE="http://madwifi.org/" DOWNLOAD="http://downloads.sourceforge.net/madwifi/madwifi-0.9.4.tar.gz" MD5SUM="399d20de8d855a59f20058857c2178ad" -MAINTAINER="Robby Workman" -EMAIL="rw@rlworkman.net" -APPROVED="David Somero" +MAINTAINER="Nobody" +EMAIL="nobody@nowhere" +APPROVED="rworkman" diff --git a/network/madwifi-driver/patches/madwifi-0.9.4_kernel_2.6.26.diff b/network/madwifi-driver/patches/madwifi-0.9.4_kernel_2.6.26.diff new file mode 100644 index 0000000000000..986d043decb71 --- /dev/null +++ b/network/madwifi-driver/patches/madwifi-0.9.4_kernel_2.6.26.diff @@ -0,0 +1,203 @@ +diff -Naur madwifi-0.9.4.orig/Makefile madwifi-0.9.4/Makefile +--- madwifi-0.9.4.orig/Makefile 2007-12-14 06:40:22.000000000 +0000 ++++ madwifi-0.9.4/Makefile 2009-01-06 18:48:14.000000000 +0000 +@@ -40,10 +40,7 @@ + # Makefile for the HAL-based Atheros driver. + # + +-ifeq ($(obj),) +-obj= . +-endif +- ++obj := $(firstword $(obj) $(SUBDIRS) .) + TOP = $(obj) + + ifneq (svnversion.h,$(MAKECMDGOALS)) +diff -Naur madwifi-0.9.4.orig/ath/Makefile madwifi-0.9.4/ath/Makefile +--- madwifi-0.9.4.orig/ath/Makefile 2007-07-25 15:23:34.000000000 +0000 ++++ madwifi-0.9.4/ath/Makefile 2009-01-06 18:48:13.000000000 +0000 +@@ -40,10 +40,7 @@ + # Makefile for the Atheros WLAN driver. + # + +-ifeq ($(obj),) +-obj= . +-endif +- ++obj := $(firstword $(obj) $(SUBDIRS) .) + TOP = $(obj)/.. + + ifeq ($(strip $(BUS)),AHB) +diff -Naur madwifi-0.9.4.orig/ath_hal/Makefile madwifi-0.9.4/ath_hal/Makefile +--- madwifi-0.9.4.orig/ath_hal/Makefile 2007-07-25 15:23:34.000000000 +0000 ++++ madwifi-0.9.4/ath_hal/Makefile 2009-01-06 18:48:13.000000000 +0000 +@@ -40,10 +40,7 @@ + # Makefile for the Atheros WLAN driver. + # + +-ifeq ($(obj),) +-obj= . +-endif +- ++obj := $(firstword $(obj) $(SUBDIRS) .) + TOP = $(obj)/.. + + include $(TOP)/Makefile.inc +diff -Naur madwifi-0.9.4.orig/ath_rate/Makefile madwifi-0.9.4/ath_rate/Makefile +--- madwifi-0.9.4.orig/ath_rate/Makefile 2007-12-12 04:11:07.000000000 +0000 ++++ madwifi-0.9.4/ath_rate/Makefile 2009-01-06 18:48:13.000000000 +0000 +@@ -1,7 +1,4 @@ +-ifeq ($(obj),) +-obj= . +-endif +- ++obj := $(firstword $(obj) $(SUBDIRS) .) + TOP = $(obj)/.. + + obj-y := amrr/ onoe/ sample/ minstrel/ +diff -Naur madwifi-0.9.4.orig/ath_rate/amrr/Makefile madwifi-0.9.4/ath_rate/amrr/Makefile +--- madwifi-0.9.4.orig/ath_rate/amrr/Makefile 2007-07-25 15:23:34.000000000 +0000 ++++ madwifi-0.9.4/ath_rate/amrr/Makefile 2009-01-06 18:48:13.000000000 +0000 +@@ -40,10 +40,7 @@ + # + # Makefile for the Atheros Rate Control Support. + # +-ifeq ($(obj),) +-obj= . +-endif +- ++obj := $(firstword $(obj) $(SUBDIRS) .) + TOP = $(obj)/../.. + + obj-m += ath_rate_amrr.o +diff -Naur madwifi-0.9.4.orig/ath_rate/minstrel/Makefile madwifi-0.9.4/ath_rate/minstrel/Makefile +--- madwifi-0.9.4.orig/ath_rate/minstrel/Makefile 2007-12-12 04:11:07.000000000 +0000 ++++ madwifi-0.9.4/ath_rate/minstrel/Makefile 2009-01-06 18:48:13.000000000 +0000 +@@ -38,10 +38,7 @@ + # + # Makefile for the Atheros Rate Control Support. + # +-ifeq ($(obj),) +-obj= . +-endif +- ++obj := $(firstword $(obj) $(SUBDIRS) .) + TOP = $(obj)/../.. + + obj-m += ath_rate_minstrel.o +diff -Naur madwifi-0.9.4.orig/ath_rate/onoe/Makefile madwifi-0.9.4/ath_rate/onoe/Makefile +--- madwifi-0.9.4.orig/ath_rate/onoe/Makefile 2007-07-25 15:23:34.000000000 +0000 ++++ madwifi-0.9.4/ath_rate/onoe/Makefile 2009-01-06 18:48:13.000000000 +0000 +@@ -40,10 +40,7 @@ + # + # Makefile for the Atheros Rate Control Support. + # +-ifeq ($(obj),) +-obj= . +-endif +- ++obj := $(firstword $(obj) $(SUBDIRS) .) + TOP = $(obj)/../.. + + obj-m += ath_rate_onoe.o +diff -Naur madwifi-0.9.4.orig/ath_rate/sample/Makefile madwifi-0.9.4/ath_rate/sample/Makefile +--- madwifi-0.9.4.orig/ath_rate/sample/Makefile 2007-07-25 15:23:34.000000000 +0000 ++++ madwifi-0.9.4/ath_rate/sample/Makefile 2009-01-06 18:48:13.000000000 +0000 +@@ -38,10 +38,7 @@ + # + # Makefile for the Atheros Rate Control Support. + # +-ifeq ($(obj),) +-obj= . +-endif +- ++obj := $(firstword $(obj) $(SUBDIRS) .) + TOP = $(obj)/../.. + + obj-m += ath_rate_sample.o +diff -Naur madwifi-0.9.4.orig/include/compat.h madwifi-0.9.4/include/compat.h +--- madwifi-0.9.4.orig/include/compat.h 2007-12-13 04:07:54.000000000 +0000 ++++ madwifi-0.9.4/include/compat.h 2009-01-06 18:48:13.000000000 +0000 +@@ -175,6 +175,13 @@ + #define DEV_ATH CTL_UNNUMBERED + #endif + ++/* __skb_append got a third parameter in 2.6.14 */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) ++#define __skb_queue_after(_list, _old, _new) __skb_append(_old, _new) ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) ++#define __skb_queue_after(_list, _old, _new) __skb_append(_old, _new, _list) ++#endif ++ + #endif /* __KERNEL__ */ + + #endif /* _ATH_COMPAT_H_ */ +diff -Naur madwifi-0.9.4.orig/net80211/Makefile madwifi-0.9.4/net80211/Makefile +--- madwifi-0.9.4.orig/net80211/Makefile 2007-07-25 15:23:34.000000000 +0000 ++++ madwifi-0.9.4/net80211/Makefile 2009-01-06 18:48:13.000000000 +0000 +@@ -39,10 +39,7 @@ + # + # Makefile for the 802.11 WLAN modules. + # +-ifeq ($(obj),) +-obj= . +-endif +- ++obj := $(firstword $(obj) $(SUBDIRS) .) + TOP = $(obj)/.. + # + # There are two authenticator mechanisms: an in-kernel implementation +diff -Naur madwifi-0.9.4.orig/net80211/ieee80211_linux.h madwifi-0.9.4/net80211/ieee80211_linux.h +--- madwifi-0.9.4.orig/net80211/ieee80211_linux.h 2007-08-30 01:59:13.000000000 +0000 ++++ madwifi-0.9.4/net80211/ieee80211_linux.h 2009-01-06 18:48:13.000000000 +0000 +@@ -238,11 +238,6 @@ + #define ACL_LOCK_ASSERT(_as) + #endif + +-/* __skb_append got a third parameter in 2.6.14 */ +-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) +-#define __skb_append(a,b,c) __skb_append(a,b) +-#endif +- + /* + * Per-node power-save queue definitions. Beware of control + * flow with IEEE80211_NODE_SAVEQ_LOCK/IEEE80211_NODE_SAVEQ_UNLOCK. +@@ -268,16 +263,16 @@ + _skb = __skb_dequeue(&(_ni)->ni_savedq); \ + (_qlen) = skb_queue_len(&(_ni)->ni_savedq); \ + } while (0) +-#define _IEEE80211_NODE_SAVEQ_ENQUEUE(_ni, _skb, _qlen, _age) do {\ +- struct sk_buff *tail = skb_peek_tail(&(_ni)->ni_savedq);\ +- if (tail != NULL) { \ +- _age -= M_AGE_GET(tail); \ +- __skb_append(tail, _skb, &(_ni)->ni_savedq); \ +- } else { \ +- __skb_queue_head(&(_ni)->ni_savedq, _skb); \ +- } \ +- M_AGE_SET(_skb, _age); \ +- (_qlen) = skb_queue_len(&(_ni)->ni_savedq); \ ++#define _IEEE80211_NODE_SAVEQ_ENQUEUE(_ni, _skb, _qlen, _age) do { \ ++ struct sk_buff *tail = skb_peek_tail(&(_ni)->ni_savedq); \ ++ if (tail != NULL) { \ ++ _age -= M_AGE_GET(tail); \ ++ __skb_queue_after(&(_ni)->ni_savedq, tail, _skb); \ ++ } else { \ ++ __skb_queue_head(&(_ni)->ni_savedq, _skb); \ ++ } \ ++ M_AGE_SET(_skb, _age); \ ++ (_qlen) = skb_queue_len(&(_ni)->ni_savedq); \ + } while (0) + + /* +diff -Naur madwifi-0.9.4.orig/net80211/ieee80211_power.c madwifi-0.9.4/net80211/ieee80211_power.c +--- madwifi-0.9.4.orig/net80211/ieee80211_power.c 2008-01-29 09:17:23.000000000 +0000 ++++ madwifi-0.9.4/net80211/ieee80211_power.c 2009-01-06 18:48:13.000000000 +0000 +@@ -237,7 +237,7 @@ + tail = skb_peek_tail(&ni->ni_savedq); + if (tail != NULL) { + age -= M_AGE_GET(tail); +- __skb_append(tail, skb, &ni->ni_savedq); ++ __skb_queue_after(&ni->ni_savedq, tail, skb); + } else + __skb_queue_head(&ni->ni_savedq, skb); + M_AGE_SET(skb, age); diff --git a/network/madwifi-driver/patches/madwifi-0.9.4_kernel_2.6.27.diff b/network/madwifi-driver/patches/madwifi-0.9.4_kernel_2.6.27.diff new file mode 100644 index 0000000000000..43325c5a3fb05 --- /dev/null +++ b/network/madwifi-driver/patches/madwifi-0.9.4_kernel_2.6.27.diff @@ -0,0 +1,159 @@ +--- /net80211/ieee80211_wireless.c (revision 3080) ++++ /net80211/ieee80211_wireless.c (revision 3811) +@@ -1552,4 +1552,5 @@ + struct iwscanreq { /* XXX: right place for this declaration? */ + struct ieee80211vap *vap; ++ struct iw_request_info *info; + char *current_ev; + char *end_buf; +@@ -1557,4 +1558,11 @@ + }; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) && !defined(IW_REQUEST_FLAG_COMPAT) ++#define iwe_stream_add_event(a, b, c, d, e) iwe_stream_add_event(b, c, d, e) ++#define iwe_stream_add_point(a, b, c, d, e) iwe_stream_add_point(b, c, d, e) ++#define iwe_stream_add_value(a, b, c, d, e, f) \ ++ iwe_stream_add_value(b, c, d, e, f) ++#define iwe_stream_lcp_len(a) IW_EV_LCP_LEN ++#endif + static int + giwscan_cb(void *arg, const struct ieee80211_scan_entry *se) +@@ -1591,5 +1599,6 @@ + else + IEEE80211_ADDR_COPY(iwe.u.ap_addr.sa_data, se->se_bssid); +- current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_ADDR_LEN); ++ current_ev = iwe_stream_add_event(req->info, current_ev, end_buf, ++ &iwe, IW_EV_ADDR_LEN); + + /* We ran out of space in the buffer. */ +@@ -1604,9 +1613,9 @@ + iwe.u.data.length = vap->iv_des_nssid > 0 ? + vap->iv_des_ssid[0].len : 0; +- current_ev = iwe_stream_add_point(current_ev, ++ current_ev = iwe_stream_add_point(req->info, current_ev, + end_buf, &iwe, vap->iv_des_ssid[0].ssid); + } else { + iwe.u.data.length = se->se_ssid[1]; +- current_ev = iwe_stream_add_point(current_ev, ++ current_ev = iwe_stream_add_point(req->info, current_ev, + end_buf, &iwe, (char *) se->se_ssid+2); + } +@@ -1622,6 +1631,6 @@ + iwe.u.mode = se->se_capinfo & IEEE80211_CAPINFO_ESS ? + IW_MODE_MASTER : IW_MODE_ADHOC; +- current_ev = iwe_stream_add_event(current_ev, +- end_buf, &iwe, IW_EV_UINT_LEN); ++ current_ev = iwe_stream_add_event(req->info, current_ev, ++ end_buf, &iwe, IW_EV_UINT_LEN); + + /* We ran out of space in the buffer. */ +@@ -1635,6 +1644,6 @@ + iwe.u.freq.m = se->se_chan->ic_freq * 100000; + iwe.u.freq.e = 1; +- current_ev = iwe_stream_add_event(current_ev, +- end_buf, &iwe, IW_EV_FREQ_LEN); ++ current_ev = iwe_stream_add_event(req->info, current_ev, ++ end_buf, &iwe, IW_EV_FREQ_LEN); + + /* We ran out of space in the buffer. */ +@@ -1646,6 +1655,6 @@ + iwe.cmd = IWEVQUAL; + set_quality(&iwe.u.qual, se->se_rssi, ATH_DEFAULT_NOISE); +- current_ev = iwe_stream_add_event(current_ev, +- end_buf, &iwe, IW_EV_QUAL_LEN); ++ current_ev = iwe_stream_add_event(req->info, current_ev, ++ end_buf, &iwe, IW_EV_QUAL_LEN); + + /* We ran out of space in the buffer */ +@@ -1661,5 +1670,6 @@ + iwe.u.data.flags = IW_ENCODE_DISABLED; + iwe.u.data.length = 0; +- current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, ""); ++ current_ev = iwe_stream_add_point(req->info, current_ev, ++ end_buf, &iwe, ""); + + /* We ran out of space in the buffer. */ +@@ -1670,5 +1680,5 @@ + last_ev = current_ev; + iwe.cmd = SIOCGIWRATE; +- current_val = current_ev + IW_EV_LCP_LEN; ++ current_val = current_ev + iwe_stream_lcp_len(req->info); + /* NB: not sorted, does it matter? */ + for (j = 0; j < se->se_rates[1]; j++) { +@@ -1676,7 +1686,7 @@ + if (r != 0) { + iwe.u.bitrate.value = r * (1000000 / 2); +- current_val = iwe_stream_add_value(current_ev, +- current_val, end_buf, &iwe, +- IW_EV_PARAM_LEN); ++ current_val = iwe_stream_add_value(req->info, ++ current_ev, current_val, end_buf, ++ &iwe, IW_EV_PARAM_LEN); + } + } +@@ -1685,11 +1695,11 @@ + if (r != 0) { + iwe.u.bitrate.value = r * (1000000 / 2); +- current_val = iwe_stream_add_value(current_ev, +- current_val, end_buf, &iwe, +- IW_EV_PARAM_LEN); ++ current_val = iwe_stream_add_value(req->info, ++ current_ev, current_val, end_buf, ++ &iwe, IW_EV_PARAM_LEN); + } + } + /* remove fixed header if no rates were added */ +- if ((current_val - current_ev) > IW_EV_LCP_LEN) { ++ if ((current_val - current_ev) > iwe_stream_lcp_len(req->info)) { + current_ev = current_val; + } else { +@@ -1705,5 +1715,6 @@ + snprintf(buf, sizeof(buf), "bcn_int=%d", se->se_intval); + iwe.u.data.length = strlen(buf); +- current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, buf); ++ current_ev = iwe_stream_add_point(req->info, current_ev, ++ end_buf, &iwe, buf); + + /* We ran out of space in the buffer. */ +@@ -1729,6 +1740,6 @@ + #endif + if (iwe.u.data.length != 0) { +- current_ev = iwe_stream_add_point(current_ev, end_buf, +- &iwe, buf); ++ current_ev = iwe_stream_add_point(req->info, ++ current_ev, end_buf, &iwe, buf); + + /* We ran out of space in the buffer */ +@@ -1755,6 +1766,6 @@ + #endif + if (iwe.u.data.length != 0) { +- current_ev = iwe_stream_add_point(current_ev, end_buf, +- &iwe, buf); ++ current_ev = iwe_stream_add_point(req->info, ++ current_ev, end_buf, &iwe, buf); + + /* We ran out of space in the buffer. */ +@@ -1774,6 +1785,6 @@ + wme_leader, sizeof(wme_leader) - 1); + if (iwe.u.data.length != 0) { +- current_ev = iwe_stream_add_point(current_ev, end_buf, +- &iwe, buf); ++ current_ev = iwe_stream_add_point(req->info, ++ current_ev, end_buf, &iwe, buf); + + /* We ran out of space in the buffer. */ +@@ -1792,6 +1803,6 @@ + ath_leader, sizeof(ath_leader) - 1); + if (iwe.u.data.length != 0) { +- current_ev = iwe_stream_add_point(current_ev, end_buf, +- &iwe, buf); ++ current_ev = iwe_stream_add_point(req->info, ++ current_ev, end_buf, &iwe, buf); + + /* We ran out of space in the buffer. */ +@@ -1816,4 +1827,5 @@ + + req.vap = vap; ++ req.info = info; + req.current_ev = extra; + if (data->length == 0) { diff --git a/network/madwifi-driver/slack-desc b/network/madwifi-driver/slack-desc index f905d64aa5f6d..c3f608df30b12 100644 --- a/network/madwifi-driver/slack-desc +++ b/network/madwifi-driver/slack-desc @@ -1,3 +1,10 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + |-----handy-ruler---------------------------------------------| madwifi-driver: madwifi-driver (kernel module for madwifi wireless driver) madwifi-driver: @@ -5,7 +12,7 @@ madwifi-driver: This package includes the madwifi kernel module part of the madwifi-driver: madwifi driver for Atheros chipsets. The madwifi tools must madwifi-driver: be built seperately. madwifi-driver: -madwifi-driver: +madwifi-driver: Homepage: http://madwifi.org/ madwifi-driver: madwifi-driver: madwifi-driver: |