nexmon – Blame information for rev 1

Subversion Repositories:
Rev:
Rev Author Line No. Line
1 office 1 --- madwifi-ng/ath/if_ath.c 2008-03-16 20:26:53.000000000 -0400
2 +++ madwifi-ng_raw/ath/if_ath.c 2008-03-17 20:11:30.000000000 -0400
3 @@ -2875,6 +2875,7 @@
4 ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb)
5 {
6 struct ath_softc *sc = dev->priv;
7 + struct ieee80211com *ic = &sc->sc_ic;
8 struct ath_hal *ah = sc->sc_ah;
9 struct ieee80211_phy_params *ph = (struct ieee80211_phy_params *)
10 (SKB_CB(skb) + 1); /* NB: SKB_CB casts to CB struct*. */
11 @@ -2888,7 +2889,12 @@
12 struct ieee80211_frame *wh;
13  
14 wh = (struct ieee80211_frame *)skb->data;
15 - try0 = ph->try0;
16 +// try0 = ph->try0;
17 + try0 = (ic->ic_opmode == IEEE80211_M_MONITOR) ? 1 : ph->try0;
18 + /*
19 + * The retry value has to be patched to 1 when injecting,
20 + * otherwise the sequence number will be overwritten
21 + */
22 rt = sc->sc_currates;
23 txrate = dot11_to_ratecode(sc, rt, ph->rate0);
24 power = ph->power > 60 ? 60 : ph->power;
25 @@ -2913,7 +2919,7 @@
26 rt = sc->sc_currates;
27 KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode));
28  
29 - if (IEEE80211_IS_MULTICAST(wh->i_addr1)) {
30 + if (IEEE80211_IS_MULTICAST(wh->i_addr1) || ((ic->ic_opmode == IEEE80211_M_MONITOR) && (skb->data[1]&3) != 0x01) ) {
31 flags |= HAL_TXDESC_NOACK; /* no ack on broad/multicast */
32 sc->sc_stats.ast_tx_noack++;
33 try0 = 1;