diff options
Diffstat (limited to 'sys/dev/ral/rt2560.c')
-rw-r--r-- | sys/dev/ral/rt2560.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/dev/ral/rt2560.c b/sys/dev/ral/rt2560.c index d7cafe1994c9..09b01ea55be9 100644 --- a/sys/dev/ral/rt2560.c +++ b/sys/dev/ral/rt2560.c @@ -1558,10 +1558,7 @@ rt2560_tx_mgt(struct rt2560_softc *sc, struct mbuf *m0, *(uint16_t *)wh->i_dur = htole16(dur); /* tell hardware to add timestamp for probe responses */ - if ((wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) == - IEEE80211_FC0_TYPE_MGT && - (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) == - IEEE80211_FC0_SUBTYPE_PROBE_RESP) + if (IEEE80211_IS_MGMT_PROBE_RESP(wh)) flags |= RT2560_TX_TIMESTAMP; } @@ -1743,7 +1740,7 @@ rt2560_tx_data(struct rt2560_softc *sc, struct mbuf *m0, rate = tp->ucastrate; } else { (void) ieee80211_ratectl_rate(ni, NULL, 0); - rate = ni->ni_txrate; + rate = ieee80211_node_get_txrate_dot11rate(ni); } if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) { @@ -1824,7 +1821,7 @@ rt2560_tx_data(struct rt2560_softc *sc, struct mbuf *m0, /* remember link conditions for rate adaptation algorithm */ if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE) { - data->rix = ni->ni_txrate; + data->rix = ieee80211_node_get_txrate_dot11rate(ni); /* XXX probably need last rssi value and not avg */ data->rssi = ic->ic_node_getrssi(ni); } else |