summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2007-01-29 23:01:50 +0000
committerStefan Schweizer <genstef@gentoo.org>2007-01-29 23:01:50 +0000
commit279286918ca92f45a4e4c9e0481a0768583dd94c (patch)
tree3abd54a8e8b03ea806fc0ead190a579ecf65fd00 /net-wireless
parentnew injection useflag for madwifi thanks to jdettner (diff)
downloadgentoo-2-279286918ca92f45a4e4c9e0481a0768583dd94c.tar.gz
gentoo-2-279286918ca92f45a4e4c9e0481a0768583dd94c.tar.bz2
gentoo-2-279286918ca92f45a4e4c9e0481a0768583dd94c.zip
Add injection useflag and patch thanks to jdettner
(Portage version: 2.1.2-r4)
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/madwifi-ng/ChangeLog8
-rw-r--r--net-wireless/madwifi-ng/files/madwifi-ng-r1886.patch26
-rw-r--r--net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild7
3 files changed, 36 insertions, 5 deletions
diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog
index 2a3d88cadca8..36d3348390be 100644
--- a/net-wireless/madwifi-ng/ChangeLog
+++ b/net-wireless/madwifi-ng/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-wireless/madwifi-ng
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.21 2006/12/10 20:52:52 kingtaco Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.22 2007/01/29 23:01:50 genstef Exp $
+
+ 29 Jan 2007; <genstef@gentoo.org> +files/madwifi-ng-r1886.patch,
+ madwifi-ng-0.9.2.1.ebuild:
+ Add injection useflag and patch thanks to jdettner
10 Dec 2006; Mike Doty <kingtaco@gentoo.org> madwifi-ng-0.9.2.1.ebuild:
amd64 stable, bug 157449
diff --git a/net-wireless/madwifi-ng/files/madwifi-ng-r1886.patch b/net-wireless/madwifi-ng/files/madwifi-ng-r1886.patch
new file mode 100644
index 000000000000..1ee11bec1c3f
--- /dev/null
+++ b/net-wireless/madwifi-ng/files/madwifi-ng-r1886.patch
@@ -0,0 +1,26 @@
+allow to inject packets with aircrack-ng
+
+diff -ur ath/if_ath.c ath/if_ath.c
+--- ath/if_ath.c 2007-01-07 21:22:55.312500000 +0100
++++ ath/if_ath.c 2007-01-07 21:17:09.875000000 +0100
+@@ -2289,6 +2289,7 @@
+ ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb)
+ {
+ struct ath_softc *sc = dev->priv;
++ struct ieee80211com *ic = &sc->sc_ic;
+ struct ath_hal *ah = sc->sc_ah;
+ struct ieee80211_phy_params *ph = (struct ieee80211_phy_params *) (skb->cb + sizeof(struct ieee80211_cb));
+ const HAL_RATE_TABLE *rt;
+@@ -2305,7 +2306,11 @@
+ struct ieee80211_frame *wh;
+
+ wh = (struct ieee80211_frame *) skb->data;
+- try0 = ph->try0;
++ try0 = (ic->ic_opmode == IEEE80211_M_MONITOR) ? 1 : ph->try0;
++ /*
++ * The retry value has to be patched to 1 when injecting,
++ * otherwise the sequence number will be overwritten
++ */
+ rt = sc->sc_currates;
+ txrate = dot11_to_ratecode(sc, rt, ph->rate0);
+ power = ph->power > 60 ? 60 : ph->power;
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild
index b2f23366a197..f2304d89034a 100644
--- a/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild
+++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.9.2.1.ebuild,v 1.4 2006/12/10 20:52:52 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild,v 1.5 2007/01/29 23:01:50 genstef Exp $
inherit linux-mod
@@ -16,7 +16,7 @@ LICENSE="as-is
SLOT="0"
KEYWORDS="amd64 ppc x86"
-IUSE="amrr onoe"
+IUSE="amrr injection onoe"
DEPEND="app-arch/sharutils"
RDEPEND="!net-wireless/madwifi-old
~net-wireless/madwifi-ng-tools-${PV:0:5}"
@@ -76,6 +76,7 @@ src_unpack() {
src_compile() {
epatch ${FILESDIR}/madwifi-ng-uudecode-gcda-fix.patch
+ if use injection; then epatch ${FILESDIR}/madwifi-ng-r1886.patch; fi
# epatch ${FILESDIR}/madwifi-association-fix.patch
# assists in debugging