new madwifi using the new hal branch which has the best hardware support

This commit is contained in:
Zero_Chaos 2009-01-19 23:15:00 +00:00
parent ec6877119a
commit f5a030733f
2 changed files with 160 additions and 0 deletions

View file

@ -0,0 +1,32 @@
Index: ath/if_ath.c
===================================================================
--- ath/if_ath.c (revision 3925)
+++ ath/if_ath.c (working copy)
@@ -3002,6 +3002,7 @@
ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb)
{
struct ath_softc *sc = netdev_priv(dev);
+ struct ieee80211com *ic = &sc->sc_ic;
struct ath_hal *ah = sc->sc_ah;
struct ieee80211_phy_params *ph = &(SKB_CB(skb)->phy);
const HAL_RATE_TABLE *rt;
@@ -3014,7 +3015,8 @@
struct ieee80211_frame *wh;
wh = (struct ieee80211_frame *)skb->data;
- try0 = ph->try[0];
+// try0 = ph->try[0];
+ try0 = (ic->ic_opmode == IEEE80211_M_MONITOR) ? 1 : ph->try[0];
rt = sc->sc_currates;
txrate = dot11_to_ratecode(sc, rt, ph->rate[0]);
power = ph->power > 60 ? 60 : ph->power;
@@ -3038,7 +3040,8 @@
rt = sc->sc_currates;
KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode));
- if (IEEE80211_IS_MULTICAST(wh->i_addr1)) {
+ if (IEEE80211_IS_MULTICAST(wh->i_addr1) || ((ic->ic_opmode ==
+IEEE80211_M_MONITOR) && (skb->data[1]&3) != 0x01) ) {
flags |= HAL_TXDESC_NOACK; /* no ack on broad/multicast */
sc->sc_stats.ast_tx_noack++;
try0 = 1;

View file

@ -0,0 +1,128 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.0.1531.20060427.ebuild,v 1.2 2006/08/05 14:11:09 dertobi123 Exp $
inherit linux-mod
MY_P=${PN}-r${PV:4:4}-${PV:9:10}
S=${WORKDIR}/${MY_P}
DESCRIPTION="Next Generation driver for Atheros based IEEE 802.11a/b/g wireless LAN cards"
HOMEPAGE="http://www.madwifi-project.org/"
SRC_URI="http://snapshots.madwifi-project.org/madwifi-hal-0.10.5.6/${MY_P}.tar.gz"
LICENSE="as-is
|| ( BSD GPL-2 )"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE="amrr onoe"
DEPEND="app-arch/sharutils"
RDEPEND="!net-wireless/madwifi-old
=net-wireless/madwifi-ng-tools-${PV}"
CONFIG_CHECK="CRYPTO NET_RADIO SYSCTL"
ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)."
ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)."
BUILD_TARGETS="all"
MODULESD_ATH_PCI_DOCS="README"
pkg_setup() {
linux-mod_pkg_setup
MODULE_NAMES="ath_hal(net:${S}/ath)
wlan(net:${S}/net80211)
wlan_acl(net:${S}/net80211)
wlan_ccmp(net:${S}/net80211)
wlan_tkip(net:${S}/net80211)
wlan_wep(net:${S}/net80211)
wlan_xauth(net:${S}/net80211)
wlan_scan_sta(net:${S}/net80211)
wlan_scan_ap(net:${S}/net80211)"
BUILD_PARAMS="KERNELPATH=${KV_OUT_DIR} TARGET=i386-elf"
if use amrr && use onoe; then
eerror
eerror "USE=\"amrr onoe\" is invalid, you can only specify one at a time."
eerror
die "USE=\"amrr onoe\" is invalid"
fi
if use amrr; then
MODULE_NAMES="${MODULE_NAMES} ath_rate_amrr(net:${S}/ath_rate/amrr)"
BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/amrr"
elif use onoe; then
MODULE_NAMES="${MODULE_NAMES} ath_rate_onoe(net:${S}/ath_rate/onoe)"
BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/onoe"
else
MODULE_NAMES="${MODULE_NAMES} ath_rate_sample(net:${S}/ath_rate/sample)"
BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/sample"
fi
MODULE_NAMES="${MODULE_NAMES} ath_pci(net:${S}/ath)"
}
src_unpack() {
unpack ${A}
cd ${S}
for dir in ath net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample; do
convert_to_m ${S}/${dir}/Makefile
done
}
src_compile() {
epatch ${FILESDIR}/madwifi-ng-r1754.patch
# assists in debugging
emake KERNELPATH=${KV_OUT_DIR} info TARGET=i386-elf || die "emake info failed"
# needed by the modules
emake svnversion.h
linux-mod_src_compile
}
src_install() {
linux-mod_src_install
dodoc README THANKS docs/users-guide.pdf docs/WEP-HOWTO.txt
# install headers for use by
# net-wireless/wpa_supplicant and net-wireless/hostapd
insinto /usr/include/madwifi/include/
doins include/*.h
insinto /usr/include/madwifi/net80211
doins net80211/*.h
}
pkg_postinst() {
local moddir="${ROOT}/lib/modules/${KV_FULL}/net/"
einfo "Removing old ath_rate modules"
if use amrr; then
[[ -f "${moddir}/ath_rate_onoe.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_onoe.${KV_OBJ}"
[[ -f "${moddir}/ath_rate_sample.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_sample.${KV_OBJ}"
elif use onoe; then
[[ -f "${moddir}/ath_rate_amrr.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_amrr.${KV_OBJ}"
[[ -f "${moddir}/ath_rate_sample.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_sample.${KV_OBJ}"
else
[[ -f "${moddir}/ath_rate_amrr.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_amrr.${KV_OBJ}"
[[ -f "${moddir}/ath_rate_onoe.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_onoe.${KV_OBJ}"
fi
linux-mod_pkg_postinst
einfo
einfo "Interfaces (athX) are now automatically created upon loading the ath_pci"
einfo "module."
einfo
einfo "The type of the created interface can be controlled through the 'autocreate'"
einfo "module parameter."
einfo
einfo "If you use net-wireless/wpa_supplicant or net-wireless/hostapd with madwifi"
einfo "you should remerge them now."
einfo
}