*** madwifi-hal-0.10.5.6-r4003-20090416-orig/ath/if_ath.c	2009-04-15 06:34:55.000000000 +0200
--- madwifi-hal-0.10.5.6-r4003-20090416/ath/if_ath.c	2009-04-25 18:15:32.000000000 +0200
***************
*** 3022,3027 ****
--- 3022,3028 ----
  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 = &(SKB_CB(skb)->phy); 
  	const HAL_RATE_TABLE *rt;
***************
*** 3034,3040 ****
  	struct ieee80211_frame *wh;
  
  	wh = (struct ieee80211_frame *)skb->data;
! 	try0 = ph->try[0];
  	rt = sc->sc_currates;
  	txrate = dot11_to_ratecode(sc, rt, ph->rate[0]);
  	power = ph->power > 60 ? 60 : ph->power;
--- 3035,3042 ----
  	struct ieee80211_frame *wh;
  
  	wh = (struct ieee80211_frame *)skb->data;
! //	try0 = ph->try[0];
! 	try0 = (ic->ic_opmode == IEEE80211_M_MONITOR) ? 1 : ph->try[0];
  	rt = sc->sc_currates;
  	txrate = dot11_to_ratecode(sc, rt, ph->rate[0]);
  	power = ph->power > 60 ? 60 : ph->power;
***************
*** 3058,3064 ****
  	rt = sc->sc_currates;
  	KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode));
  
! 	if (IEEE80211_IS_MULTICAST(wh->i_addr1)) {
  		flags |= HAL_TXDESC_NOACK;	/* no ack on broad/multicast */
  		sc->sc_stats.ast_tx_noack++;
  		try0 = 1;
--- 3060,3067 ----
  	rt = sc->sc_currates;
  	KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode));
  
! 	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;