[gentoo-commits] gentoo-x86 commit in net-wireless/madwifi-ng/files: madwifi-ng-injection-r3925.patch

[Peter Volkov (pva)]

pva         09/06/03 12:17:22

  Added:                madwifi-ng-injection-r3925.patch
  Log:
  Added missed injection patch, bug #272372, thank Pierre-Yves AILLET for report.
  (Portage version: 2.2_rc33/cvs/Linux i686)

Revision  Changes    Path
1.1                  net-wireless/madwifi-ng/files/madwifi-ng-injection-r3925.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/madwifi-ng/files/madwifi-ng-injection-r3925.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/madwifi-ng/files/madwifi-ng-injection-r3925.patch?rev=1.1&content-type=text/plain

Index: madwifi-ng-injection-r3925.patch
===================================================================
=== 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;