[patch] Patch for injection for 2.6.29 patched sources

madwifi-ng-r3925.patch (text/plain), 1.22 KB, created by Draco Levanah on 2009-04-09 21:14:21 UTC

Index: ath/if_ath.c
===================================================================
--- ath/if_ath.c	2009-04-09 16:00:14.000000000 -0500
+++ ath/if_ath.c	2009-04-09 16:00:30.000000000 -0500
@@ -2341,6 +2341,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;
@@ -2357,7 +2358,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;
@@ -2386,7 +2388,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;