--- madwifi-ng/ath/if_ath.c	2008-03-16 20:26:53.000000000 -0400
+++ madwifi-ng_raw/ath/if_ath.c	2008-03-17 20:11:30.000000000 -0400
@@ -2875,6 +2875,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(skb) + 1); /* NB: SKB_CB casts to CB struct*. */
@@ -2888,7 +2889,12 @@
 	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;
+        /*
+         * 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;
@@ -2913,7 +2919,7 @@
 	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;
