diff options
| author | sam <sam@FreeBSD.org> | 2009-03-29 21:17:08 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2009-03-29 21:17:08 +0000 |
| commit | f7c50ce1e4a47dd26c6dc6d42d8a07343e9d020b (patch) | |
| tree | 3adee507d18d3410de7636b1c9fdf73932df5b00 /sys/dev/usb/wlan/if_ural.c | |
| parent | 616f4bd2e5f839f51b2cfd6f131a31b7d81e837c (diff) | |
| download | FreeBSD-src-f7c50ce1e4a47dd26c6dc6d42d8a07343e9d020b.zip FreeBSD-src-f7c50ce1e4a47dd26c6dc6d42d8a07343e9d020b.tar.gz | |
o add ic_rt to track the rate table for the current channel; this enables
calculation of packet transmit times to do things like check txop limits
o remove equivalent driver code and convert to use net80211 state
Diffstat (limited to 'sys/dev/usb/wlan/if_ural.c')
| -rw-r--r-- | sys/dev/usb/wlan/if_ural.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/sys/dev/usb/wlan/if_ural.c b/sys/dev/usb/wlan/if_ural.c index 83a517f..c1d01a3 100644 --- a/sys/dev/usb/wlan/if_ural.c +++ b/sys/dev/usb/wlan/if_ural.c @@ -518,8 +518,6 @@ ural_attach_post(struct usb2_proc_msg *pm) ic->ic_vap_create = ural_vap_create; ic->ic_vap_delete = ural_vap_delete; - sc->sc_rates = ieee80211_get_ratetable(ic->ic_curchan); - bpfattach(ifp, DLT_IEEE802_11_RADIO, sizeof (struct ieee80211_frame) + sizeof(sc->sc_txtap)); @@ -1108,7 +1106,7 @@ ural_setup_tx_desc(struct ural_softc *sc, struct ural_tx_desc *desc, desc->plcp_service = 4; len += IEEE80211_CRC_LEN; - if (ieee80211_rate2phytype(sc->sc_rates, rate) == IEEE80211_T_OFDM) { + if (ieee80211_rate2phytype(ic->ic_rt, rate) == IEEE80211_T_OFDM) { desc->flags |= htole32(RAL_TX_OFDM); plcp_length = len & 0xfff; @@ -1209,7 +1207,7 @@ ural_tx_mgt(struct ural_softc *sc, struct mbuf *m0, struct ieee80211_node *ni) if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) { flags |= RAL_TX_ACK; - dur = ieee80211_ack_duration(sc->sc_rates, tp->mgmtrate, + dur = ieee80211_ack_duration(ic->ic_rt, tp->mgmtrate, ic->ic_flags & IEEE80211_F_SHPREAMBLE); *(uint16_t *)wh->i_dur = htole16(dur); @@ -1249,16 +1247,16 @@ ural_sendprot(struct ural_softc *sc, wh = mtod(m, const struct ieee80211_frame *); pktlen = m->m_pkthdr.len + IEEE80211_CRC_LEN; - protrate = ieee80211_ctl_rate(sc->sc_rates, rate); - ackrate = ieee80211_ack_rate(sc->sc_rates, rate); + protrate = ieee80211_ctl_rate(ic->ic_rt, rate); + ackrate = ieee80211_ack_rate(ic->ic_rt, rate); isshort = (ic->ic_flags & IEEE80211_F_SHPREAMBLE) != 0; - dur = ieee80211_compute_duration(sc->sc_rates, pktlen, rate, isshort); - + ieee80211_ack_duration(sc->sc_rates, rate, isshort); + dur = ieee80211_compute_duration(ic->ic_rt, pktlen, rate, isshort); + + ieee80211_ack_duration(ic->ic_rt, rate, isshort); flags = RAL_TX_RETRY(7); if (prot == IEEE80211_PROT_RTSCTS) { /* NB: CTS is the same size as an ACK */ - dur += ieee80211_ack_duration(sc->sc_rates, rate, isshort); + dur += ieee80211_ack_duration(ic->ic_rt, rate, isshort); flags |= RAL_TX_ACK; mprot = ieee80211_alloc_rts(ic, wh->i_addr1, wh->i_addr2, dur); } else { @@ -1376,7 +1374,7 @@ ural_tx_data(struct ural_softc *sc, struct mbuf *m0, struct ieee80211_node *ni) if (m0->m_pkthdr.len + IEEE80211_CRC_LEN > vap->iv_rtsthreshold) prot = IEEE80211_PROT_RTSCTS; else if ((ic->ic_flags & IEEE80211_F_USEPROT) && - ieee80211_rate2phytype(sc->sc_rates, rate) == IEEE80211_T_OFDM) + ieee80211_rate2phytype(ic->ic_rt, rate) == IEEE80211_T_OFDM) prot = ic->ic_protmode; if (prot != IEEE80211_PROT_NONE) { error = ural_sendprot(sc, m0, ni, prot, rate); @@ -1400,7 +1398,7 @@ ural_tx_data(struct ural_softc *sc, struct mbuf *m0, struct ieee80211_node *ni) flags |= RAL_TX_ACK; flags |= RAL_TX_RETRY(7); - dur = ieee80211_ack_duration(sc->sc_rates, rate, + dur = ieee80211_ack_duration(ic->ic_rt, rate, ic->ic_flags & IEEE80211_F_SHPREAMBLE); *(uint16_t *)wh->i_dur = htole16(dur); } @@ -1742,8 +1740,6 @@ ural_set_channel(struct ieee80211com *ic) sc->sc_scan_action = URAL_SET_CHANNEL; ural_queue_command(sc, ural_scantask, &sc->sc_scantask[0].hdr, &sc->sc_scantask[1].hdr); - - sc->sc_rates = ieee80211_get_ratetable(ic->ic_curchan); RAL_UNLOCK(sc); } |
