openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ath5k: use the skb->cb directly for RX status 

Save a memcpy by just storing updates directly in the skb
control block.

Signed-off-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Bob Copeland 2009-08-24 23:00:32 -04:00 committed by John W. Linville
parent 09c9bae26b
commit 1c5256bb16
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/net/wireless/ath/ath5k/base.c
View File

@ -1741,7 +1741,7 @@ ath5k_check_ibss_tsf(struct ath5k_softc *sc, struct sk_buff *skb,
static void static void
ath5k_tasklet_rx(unsigned long data) ath5k_tasklet_rx(unsigned long data)
{ {
struct ieee80211_rx_status rxs = {}; struct ieee80211_rx_status *rxs;
struct ath5k_rx_status rs = {}; struct ath5k_rx_status rs = {};
struct sk_buff *skb, *next_skb; struct sk_buff *skb, *next_skb;
dma_addr_t next_skb_addr; dma_addr_t next_skb_addr;
@ -1751,6 +1751,7 @@ ath5k_tasklet_rx(unsigned long data)
int ret; int ret;
int hdrlen; int hdrlen;
int padsize; int padsize;
int rx_flag;
spin_lock(&sc->rxbuflock); spin_lock(&sc->rxbuflock);
if (list_empty(&sc->rxbuf)) { if (list_empty(&sc->rxbuf)) {
@ -1758,7 +1759,7 @@ ath5k_tasklet_rx(unsigned long data)
goto unlock; goto unlock;
} }
do { do {
rxs.flag = 0; rx_flag = 0;
bf = list_first_entry(&sc->rxbuf, struct ath5k_buf, list); bf = list_first_entry(&sc->rxbuf, struct ath5k_buf, list);
BUG_ON(bf->skb == NULL); BUG_ON(bf->skb == NULL);
@ -1802,7 +1803,7 @@ ath5k_tasklet_rx(unsigned long data)
goto accept; goto accept;
} }
if (rs.rs_status & AR5K_RXERR_MIC) { if (rs.rs_status & AR5K_RXERR_MIC) {
rxs.flag |= RX_FLAG_MMIC_ERROR; rx_flag |= RX_FLAG_MMIC_ERROR;
goto accept; goto accept;
} }
@ -1840,6 +1841,7 @@ ath5k_tasklet_rx(unsigned long data)
memmove(skb->data + padsize, skb->data, hdrlen); memmove(skb->data + padsize, skb->data, hdrlen);
skb_pull(skb, padsize); skb_pull(skb, padsize);
} }
rxs = IEEE80211_SKB_RXCB(skb);
/* /*
* always extend the mac timestamp, since this information is * always extend the mac timestamp, since this information is
@ -1861,41 +1863,40 @@ ath5k_tasklet_rx(unsigned long data)
* impossible to comply to that. This affects IBSS merge only * impossible to comply to that. This affects IBSS merge only
* right now, so it's not too bad... * right now, so it's not too bad...
*/ */
rxs.mactime = ath5k_extend_tsf(sc->ah, rs.rs_tstamp); rxs->mactime = ath5k_extend_tsf(sc->ah, rs.rs_tstamp);
rxs.flag |= RX_FLAG_TSFT; rxs->flag = rx_flag | RX_FLAG_TSFT;
rxs.freq = sc->curchan->center_freq; rxs->freq = sc->curchan->center_freq;
rxs.band = sc->curband->band; rxs->band = sc->curband->band;
rxs.noise = sc->ah->ah_noise_floor; rxs->noise = sc->ah->ah_noise_floor;
rxs.signal = rxs.noise + rs.rs_rssi; rxs->signal = rxs->noise + rs.rs_rssi;
/* An rssi of 35 indicates you should be able use /* An rssi of 35 indicates you should be able use
* 54 Mbps reliably. A more elaborate scheme can be used * 54 Mbps reliably. A more elaborate scheme can be used
* here but it requires a map of SNR/throughput for each * here but it requires a map of SNR/throughput for each
* possible mode used */ * possible mode used */
rxs.qual = rs.rs_rssi * 100 / 35; rxs->qual = rs.rs_rssi * 100 / 35;
/* rssi can be more than 35 though, anything above that /* rssi can be more than 35 though, anything above that
* should be considered at 100% */ * should be considered at 100% */
if (rxs.qual > 100) if (rxs->qual > 100)
rxs.qual = 100; rxs->qual = 100;
rxs.antenna = rs.rs_antenna; rxs->antenna = rs.rs_antenna;
rxs.rate_idx = ath5k_hw_to_driver_rix(sc, rs.rs_rate); rxs->rate_idx = ath5k_hw_to_driver_rix(sc, rs.rs_rate);
rxs.flag |= ath5k_rx_decrypted(sc, ds, skb, &rs); rxs->flag |= ath5k_rx_decrypted(sc, ds, skb, &rs);
if (rxs.rate_idx >= 0 && rs.rs_rate == if (rxs->rate_idx >= 0 && rs.rs_rate ==
sc->curband->bitrates[rxs.rate_idx].hw_value_short) sc->curband->bitrates[rxs->rate_idx].hw_value_short)
rxs.flag |= RX_FLAG_SHORTPRE; rxs->flag |= RX_FLAG_SHORTPRE;
ath5k_debug_dump_skb(sc, skb, "RX ", 0); ath5k_debug_dump_skb(sc, skb, "RX ", 0);
/* check beacons in IBSS mode */ /* check beacons in IBSS mode */
if (sc->opmode == NL80211_IFTYPE_ADHOC) if (sc->opmode == NL80211_IFTYPE_ADHOC)
ath5k_check_ibss_tsf(sc, skb, &rxs); ath5k_check_ibss_tsf(sc, skb, rxs);
memcpy(IEEE80211_SKB_RXCB(skb), &rxs, sizeof(rxs));
ieee80211_rx(sc->hw, skb); ieee80211_rx(sc->hw, skb);
bf->skb = next_skb; bf->skb = next_skb;