| 1 |
Index: ath/if_ath.c |
| 2 |
=================================================================== |
| 3 |
--- ath/if_ath.c (revision 3925) |
| 4 |
+++ ath/if_ath.c (working copy) |
| 5 |
@@ -3002,6 +3002,7 @@ |
| 6 |
ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb) |
| 7 |
{ |
| 8 |
struct ath_softc *sc = netdev_priv(dev); |
| 9 |
+ struct ieee80211com *ic = &sc->sc_ic; |
| 10 |
struct ath_hal *ah = sc->sc_ah; |
| 11 |
struct ieee80211_phy_params *ph = &(SKB_CB(skb)->phy); |
| 12 |
const HAL_RATE_TABLE *rt; |
| 13 |
@@ -3014,7 +3015,8 @@ |
| 14 |
struct ieee80211_frame *wh; |
| 15 |
|
| 16 |
wh = (struct ieee80211_frame *)skb->data; |
| 17 |
- try0 = ph->try[0]; |
| 18 |
+// try0 = ph->try[0]; |
| 19 |
+ try0 = (ic->ic_opmode == IEEE80211_M_MONITOR) ? 1 : ph->try[0]; |
| 20 |
rt = sc->sc_currates; |
| 21 |
txrate = dot11_to_ratecode(sc, rt, ph->rate[0]); |
| 22 |
power = ph->power > 60 ? 60 : ph->power; |
| 23 |
@@ -3038,7 +3040,8 @@ |
| 24 |
rt = sc->sc_currates; |
| 25 |
KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode)); |
| 26 |
|
| 27 |
- if (IEEE80211_IS_MULTICAST(wh->i_addr1)) { |
| 28 |
+ if (IEEE80211_IS_MULTICAST(wh->i_addr1) || ((ic->ic_opmode == |
| 29 |
+IEEE80211_M_MONITOR) && (skb->data[1]&3) != 0x01) ) { |
| 30 |
flags |= HAL_TXDESC_NOACK; /* no ack on broad/multicast */ |
| 31 |
sc->sc_stats.ast_tx_noack++; |
| 32 |
try0 = 1; |