Added missed injection patch, bug #272372, thank Pierre-Yves AILLET for report.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

3 files changed, 40 insertions, 2 deletions

diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog
index 555459ad4d56..e5081e94e2dc 100644
--- a/net-wireless/madwifi-ng/ChangeLog
+++ b/net-wireless/madwifi-ng/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/madwifi-ng
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.67 2009/06/01 16:46:54 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.68 2009/06/03 12:17:22 pva Exp $
+
+  03 Jun 2009; Peter Volkov <pva@gentoo.org>
+  +files/madwifi-ng-injection-r3925.patch:
+  Added missed injection patch, bug #272372, thank Pierre-Yves AILLET for
+  report.
 
 *madwifi-ng-0.9.4.4030.20090529 (01 Jun 2009)
 
diff --git a/net-wireless/madwifi-ng/Manifest b/net-wireless/madwifi-ng/Manifest
index 492a574502d2..c01881b92d46 100644
--- a/net-wireless/madwifi-ng/Manifest
+++ b/net-wireless/madwifi-ng/Manifest
@@ -2,6 +2,7 @@ AUX madwifi-dfs-ieee80211-skb-update.patch 453 RMD160 856e6931da9bf96bc993a6f568
 AUX madwifi-ng-0.9.3-uudecode-gcda-fix.patch 340 RMD160 2a18fc4f9e66aa131e901e7e46930e08e2ece7ea SHA1 3c84bf4e203ab3c810c734816dd1291ba19b0005 SHA256 be6e7a66acad56044c25ab56d9cbd7d5326c4ba21f5d9ed25caef56a9577bdc8
 AUX madwifi-ng-0.9.4-2.6.27-r3811.patch 6515 RMD160 6d52c90f5afad8c225a2d23d90af593e4f00b666 SHA1 0f49938eb9a9b523ebb8925a446018010454184b SHA256 d98fc130d1588b599119eda5d3d723f6e7b83201a89ca9c1bac8760042308e41
 AUX madwifi-ng-0.9.4-request_module-build.patch 860 RMD160 d34c08fe10e21226e1593098cf23edc98275d907 SHA1 4a3c9894a8272aefe5be4c718753ead8c4277858 SHA256 5a9ade8f6d5c86ef7e80085c55983a6cf7269d367d383f175f3b88974ddd47aa
+AUX madwifi-ng-injection-r3925.patch 1171 RMD160 f00fb830c3116b8ef5c6b0277105f8ffb9126b46 SHA1 9eb78206792d0f1c8fc230e3b850849cb86080d9 SHA256 48892221bea5da0a34c51235a80201e0bebb63be22075b04df659ce06a09dfed
 AUX madwifi-ng-r1886.patch 965 RMD160 86389659efbd846c12153c7e11043f0fb3c7fd8b SHA1 cda44aff6e99ade85b736cc2f31b13cfee6c3721 SHA256 e068fbfaf9c2f27ac9670b6fc43939ceade0e6c40df88d5e23006be640ca0fbe
 DIST madwifi-0.9.3.3.tar.bz2 3489995 RMD160 ed4b5267171bb11801817b7ba358fe3b08377329 SHA1 13df0e407de0f5b733e5ff1b660ce2fac048b206 SHA256 7e38cb26d5b001e9fb36f48aaefdeee10d1dc57c83e675e3bbd0f1807a3305b7
 DIST madwifi-0.9.4-r4030-20090529.tar.gz 3533333 RMD160 0aaca44ed992b11fb10eb877dd74f3fad06620e4 SHA1 a22855b79b73ffebda76e7605832dcf3c303e23b SHA256 f310d10c2a6dec310609401e148916dcf28c70e9e786ac0fae652c9a31d4d6cf
@@ -10,5 +11,5 @@ EBUILD madwifi-ng-0.9.3.3.ebuild 2648 RMD160 532e75561cd39cc9a9ae7a8e1f4227576e2
 EBUILD madwifi-ng-0.9.4-r1.ebuild 3294 RMD160 0b69dcc263804bb1653b2e75ea21c598763197f9 SHA1 d7078b04880005c9b86557fe42e80d9be7aded91 SHA256 652ebafeec6f90e7a9c58f6587487bb063c6eccf72af2a0aaeab00154c5033ee
 EBUILD madwifi-ng-0.9.4.4030.20090529.ebuild 3214 RMD160 7208b713c4560b2a0492f9e9b1296d6877088a56 SHA1 f06fe2197966fa12df3e2d2ccb117685c7386ec1 SHA256 10b8ae3a8fd7cb0fc8028875b9af71c896ae7fac787fbb68d98dcc4a54bbb7a9
 EBUILD madwifi-ng-0.9.4.ebuild 3289 RMD160 70eca4576408be39af87c7fcc11ab8e720127eec SHA1 272d04e2c2970c8708743d3f4396b5c3d22bdc44 SHA256 2a48e40103e97b355271ef25a0f5ac34b14718f4c8f149f178feeaee833a52f7
-MISC ChangeLog 22145 RMD160 42055ef002b30b0c1da55b0e1003746f06e51f44 SHA1 c9dc103fe1e590c804a9aea73133a42d2e352ac1 SHA256 b0ceb9a9bd00862122fa35b764e8feb8290df93957d07d18bf3c31825fd11903
+MISC ChangeLog 22318 RMD160 ed5acce27497991d6bd1f29454e222c917304cdd SHA1 6981ed1a061c410fa3aaadfb1822823138e06792 SHA256 b7b554ea457af3622a5685c29f6e1cac7ae5f963479da8a2071d333456829e82
 MISC metadata.xml 474 RMD160 f4c1656da66f1c8d67b3ba7f5d796c42a28a1ea0 SHA1 0405e39b7aa5373d1e2ee8b47f015f009947738e SHA256 72b875566747e831cbd7faff930a0c3ca7d48d28b5ec0662b36b57e37d91c54f
diff --git a/net-wireless/madwifi-ng/files/madwifi-ng-injection-r3925.patch b/net-wireless/madwifi-ng/files/madwifi-ng-injection-r3925.patch
new file mode 100644
index 000000000000..1999184ec5ae
--- /dev/null
+++ b/net-wireless/madwifi-ng/files/madwifi-ng-injection-r3925.patch
@@ -0,0 +1,32 @@
+=== modified file 'ath/if_ath.c'
+--- ath/if_ath.c	2009-06-03 07:46:17 +0000
++++ ath/if_ath.c	2009-06-03 07:53:24 +0000
+@@ -2359,6 +2359,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 = (struct ieee80211_phy_params *) (skb->cb + sizeof(struct ieee80211_cb));
+ 	const HAL_RATE_TABLE *rt;
+@@ -2375,7 +2376,8 @@
+ 	struct ieee80211_frame *wh; 
+ 	
+ 	wh = (struct ieee80211_frame *) skb->data;
+-	try0 = ph->try0;
++	//try0 = ph->try0;
++	try0 = (ic->ic_opmode == IEEE80211_M_MONITOR) ? 1 : ph->try0;
+ 	rt = sc->sc_currates;
+ 	txrate = dot11_to_ratecode(sc, rt, ph->rate0);
+ 	power = ph->power > 60 ? 60 : ph->power;
+@@ -2404,7 +2406,8 @@
+ 	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;
+