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

rsu(4): do not ignore mgmtrate / mcastrate / ucastrate.

Browse Source 
Enforce net80211 rates for control / management / multicast / EAPOL frames
and allow to override rate for unicast frames via ifconfig(8) 'ucastrate'
option; by default it still uses f/w rate adaptation for unicast frames.

MFC after:	1 week
This commit is contained in:
avos 2019-01-28 11:39:54 +00:00
parent 37106b5e69
commit 12f0746328
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sys/dev/usb/wlan/if_rsu.c
View File

@ -2753,15 +2753,17 @@ static int
rsu_tx_start(struct rsu_softc *sc, struct ieee80211_node *ni,
struct mbuf *m0, struct rsu_data *data)
{
const struct ieee80211_txparam *tp = ni->ni_txparms;
struct ieee80211com *ic = &sc->sc_ic;
struct ieee80211vap *vap = ni->ni_vap;
struct ieee80211_frame *wh;
struct ieee80211_key *k = NULL;
struct r92s_tx_desc *txd;
uint8_t type, cipher;
uint8_t rate, ridx, type, cipher;
int prio = 0;
uint8_t which;
int hasqos;
int ismcast;
int xferlen;
int qid;
@ -2769,10 +2771,26 @@ rsu_tx_start(struct rsu_softc *sc, struct ieee80211_node *ni,
wh = mtod(m0, struct ieee80211_frame *);
type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
ismcast = IEEE80211_IS_MULTICAST(wh->i_addr1);
RSU_DPRINTF(sc, RSU_DEBUG_TX, "%s: data=%p, m=%p\n",
__func__, data, m0);
/* Choose a TX rate index. */
if (type == IEEE80211_FC0_TYPE_MGT ||
type == IEEE80211_FC0_TYPE_CTL ||
(m0->m_flags & M_EAPOL) != 0)
rate = tp->mgmtrate;
else if (ismcast)
rate = tp->mcastrate;
else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE)
rate = tp->ucastrate;
else
rate = 0;
if (rate != 0)
ridx = rate2ridx(rate);
if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
k = ieee80211_crypto_encap(ni, m0);
if (k == NULL) {
@ -2851,8 +2869,17 @@ rsu_tx_start(struct rsu_softc *sc, struct ieee80211_node *ni,
}
/* XXX todo: set AGGEN bit if appropriate? */
txd->txdw2 |= htole32(R92S_TXDW2_BK);
if (IEEE80211_IS_MULTICAST(wh->i_addr1))
if (ismcast)
txd->txdw2 |= htole32(R92S_TXDW2_BMCAST);
/* Force mgmt / mcast / ucast rate if needed. */
if (rate != 0) {
/* Data rate fallback limit (max). */
txd->txdw5 |= htole32(SM(R92S_TXDW5_DATARATE_FB_LMT, 0x1f));
txd->txdw5 |= htole32(SM(R92S_TXDW5_DATARATE, ridx));
txd->txdw4 |= htole32(R92S_TXDW4_DRVRATE);
}
/*
* Firmware will use and increment the sequence number for the
* specified priority.

7
sys/dev/usb/wlan/if_rsureg.h
View File

@ -700,9 +700,14 @@ struct r92s_tx_desc {
uint32_t txdw4;
#define R92S_TXDW4_TXBW 0x00040000
#define R92S_TXDW4_DRVRATE 0x80000000
uint32_t txdw5;
#define R92S_TXDW5_DISFB 0x00008000
#define R92S_TXDW5_DATARATE_M 0x00007e00
#define R92S_TXDW5_DATARATE_S 9
#define R92S_TXDW5_DISFB 0x00008000
#define R92S_TXDW5_DATARATE_FB_LMT_M 0x001f0000
#define R92S_TXDW5_DATARATE_FB_LMT_S 16
uint16_t ipchksum;
uint16_t tcpchksum;