d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rum: switch to ieee80211_add_channel_list_*()

Browse Source 
- Use device's channel list instead of default one
(from ieee80211_init_channels()).
- Add ic_getradiocaps() method.

Added channels:
2GHz band: 12, 13 and 14.
5Ghz band: 34, 38, 42, 46 and 165.

Tested with WUSB54GC, STA / MONITOR modes.

Differential Revision:	https://reviews.freebsd.org/D6125
This commit is contained in:
Andriy Voskoboinyk 2016-05-01 18:53:12 +00:00
parent 7f145aba97
commit 7b45c9dfe1
1 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sys/dev/usb/wlan/if_rum.c
View File

@ -269,6 +269,8 @@ static int rum_raw_xmit(struct ieee80211_node *, struct mbuf *,
static void rum_scan_start(struct ieee80211com *);
static void rum_scan_end(struct ieee80211com *);
static void rum_set_channel(struct ieee80211com *);
static void rum_getradiocaps(struct ieee80211com *, int, int *,
struct ieee80211_channel[]);
static int rum_get_rssi(struct rum_softc *, uint8_t);
static void rum_ratectl_start(struct rum_softc *,
struct ieee80211_node *);
@ -336,6 +338,14 @@ static const struct {
{ 107, 0x04 }
};
static const uint8_t rum_chan_2ghz[] =
{ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 };
static const uint8_t rum_chan_5ghz[] =
{ 34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64,
100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140,
149, 153, 157, 161, 165 };
static const struct rfprog {
uint8_t chan;
uint32_t r1, r2, r3, r4;
@ -477,7 +487,6 @@ rum_attach(device_t self)
struct rum_softc *sc = device_get_softc(self);
struct ieee80211com *ic = &sc->sc_ic;
uint32_t tmp;
uint8_t bands[IEEE80211_MODE_BYTES];
uint8_t iface_index;
int error, ntries;
@ -548,12 +557,8 @@ rum_attach(device_t self)
IEEE80211_CRYPTO_TKIPMIC |
IEEE80211_CRYPTO_TKIP;
memset(bands, 0, sizeof(bands));
setbit(bands, IEEE80211_MODE_11B);
setbit(bands, IEEE80211_MODE_11G);
if (sc->rf_rev == RT2573_RF_5225 || sc->rf_rev == RT2573_RF_5226)
setbit(bands, IEEE80211_MODE_11A);
ieee80211_init_channels(ic, NULL, bands);
rum_getradiocaps(ic, IEEE80211_CHAN_MAX, &ic->ic_nchans,
ic->ic_channels);
ieee80211_ifattach(ic);
ic->ic_update_promisc = rum_update_promisc;
@ -561,6 +566,7 @@ rum_attach(device_t self)
ic->ic_scan_start = rum_scan_start;
ic->ic_scan_end = rum_scan_end;
ic->ic_set_channel = rum_set_channel;
ic->ic_getradiocaps = rum_getradiocaps;
ic->ic_transmit = rum_transmit;
ic->ic_parent = rum_parent;
ic->ic_vap_create = rum_vap_create;
@ -3165,6 +3171,26 @@ rum_set_channel(struct ieee80211com *ic)
RUM_UNLOCK(sc);
}
static void
rum_getradiocaps(struct ieee80211com *ic,
int maxchans, int *nchans, struct ieee80211_channel chans[])
{
struct rum_softc *sc = ic->ic_softc;
uint8_t bands[IEEE80211_MODE_BYTES];
memset(bands, 0, sizeof(bands));
setbit(bands, IEEE80211_MODE_11B);
setbit(bands, IEEE80211_MODE_11G);
ieee80211_add_channel_list_2ghz(chans, maxchans, nchans,
rum_chan_2ghz, nitems(rum_chan_2ghz), bands, 0);
if (sc->rf_rev == RT2573_RF_5225 || sc->rf_rev == RT2573_RF_5226) {
setbit(bands, IEEE80211_MODE_11A);
ieee80211_add_channel_list_5ghz(chans, maxchans, nchans,
rum_chan_5ghz, nitems(rum_chan_5ghz), bands, 0);
}
}
static int
rum_get_rssi(struct rum_softc *sc, uint8_t raw)
{