Author: bschmidt
Date: Sat Apr 9 14:45:50 2011
New Revision: 220502
URL: http://svn.freebsd.org/changeset/base/220502
Log:
Don't hardcode assumptions about basic rates, similar to what the rt2661
support code does. While here remove an unnecessary loop.
Modified:
head/sys/dev/ral/rt2560.c
head/sys/dev/ral/rt2661.c
Modified: head/sys/dev/ral/rt2560.c
==============================================================================
--- head/sys/dev/ral/rt2560.c Sat Apr 9 14:27:27 2011 (r220501)
+++ head/sys/dev/ral/rt2560.c Sat Apr 9 14:45:50 2011 (r220502)
@@ -144,7 +144,8 @@ static void rt2560_enable_tsf_sync(stru
static void rt2560_enable_tsf(struct rt2560_softc *);
static void rt2560_update_plcp(struct rt2560_softc *);
static void rt2560_update_slot(struct ifnet *);
-static void rt2560_set_basicrates(struct rt2560_softc *);
+static void rt2560_set_basicrates(struct rt2560_softc *,
+ const struct ieee80211_rateset *);
static void rt2560_update_led(struct rt2560_softc *, int, int);
static void rt2560_set_bssid(struct rt2560_softc *, const uint8_t
*);
static void rt2560_set_macaddr(struct rt2560_softc *, uint8_t *);
@@ -779,7 +780,7 @@ rt2560_newstate(struct ieee80211vap *vap
if (vap->iv_opmode != IEEE80211_M_MONITOR) {
rt2560_update_plcp(sc);
- rt2560_set_basicrates(sc);
+ rt2560_set_basicrates(sc, &ni->ni_rates);
rt2560_set_bssid(sc, ni->ni_bssid);
}
@@ -2353,22 +2354,29 @@ rt2560_update_slot(struct ifnet *ifp)
}
static void
-rt2560_set_basicrates(struct rt2560_softc *sc)
+rt2560_set_basicrates(struct rt2560_softc *sc,
+ const struct ieee80211_rateset *rs)
{
+#define RV(r) ((r) & IEEE80211_RATE_VAL)
struct ifnet *ifp = sc->sc_ifp;
struct ieee80211com *ic = ifp->if_l2com;
+ uint32_t mask = 0;
+ uint8_t rate;
+ int i;
- /* update basic rate set */
- if (ic->ic_curmode == IEEE80211_MODE_11B) {
- /* 11b basic rates: 1, 2Mbps */
- RAL_WRITE(sc, RT2560_ARSP_PLCP_1, 0x3);
- } else if (IEEE80211_IS_CHAN_5GHZ(ic->ic_curchan)) {
- /* 11a basic rates: 6, 12, 24Mbps */
- RAL_WRITE(sc, RT2560_ARSP_PLCP_1, 0x150);
- } else {
- /* 11g basic rates: 1, 2, 5.5, 11, 6, 12, 24Mbps */
- RAL_WRITE(sc, RT2560_ARSP_PLCP_1, 0x15f);
+ for (i = 0; i < rs->rs_nrates; i++) {
+ rate = rs->rs_rates[i];
+
+ if (!(rate & IEEE80211_RATE_BASIC))
+ continue;
+
+ mask |= 1 << ic->ic_rt->rateCodeToIndex[RV(rate)];
}
+
+ RAL_WRITE(sc, RT2560_ARSP_PLCP_1, mask);
+
+ DPRINTF(sc, "Setting basic rate mask to 0x%x\n", mask);
+#undef RV
}
static void
Modified: head/sys/dev/ral/rt2661.c
==============================================================================
--- head/sys/dev/ral/rt2661.c Sat Apr 9 14:27:27 2011 (r220501)
+++ head/sys/dev/ral/rt2661.c Sat Apr 9 14:45:50 2011 (r220502)
@@ -1915,7 +1915,7 @@ rt2661_set_basicrates(struct rt2661_soft
struct ieee80211com *ic = ifp->if_l2com;
uint32_t mask = 0;
uint8_t rate;
- int i, j;
+ int i;
for (i = 0; i < rs->rs_nrates; i++) {
rate = rs->rs_rates[i];
@@ -1923,13 +1923,7 @@ rt2661_set_basicrates(struct rt2661_soft
if (!(rate & IEEE80211_RATE_BASIC))
continue;
- /*
- * Find h/w rate index. We know it exists because the rate
- * set has already been negotiated.
- */
- for (j = 0; ic->ic_sup_rates[IEEE80211_MODE_11G].rs_rates[j] !=
RV(rate); j++);
-
- mask |= 1 << j;
+ mask |= 1 << ic->ic_rt->rateCodeToIndex[RV(rate)];
}
RAL_WRITE(sc, RT2661_TXRX_CSR5, mask);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
