diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/xmit.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index faf2cab49ea3..41c42824a5ca 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c | |||
@@ -434,7 +434,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq, | |||
434 | static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf, | 434 | static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf, |
435 | struct ath_atx_tid *tid) | 435 | struct ath_atx_tid *tid) |
436 | { | 436 | { |
437 | struct ath_rate_table *rate_table = sc->cur_rate_table; | 437 | const struct ath_rate_table *rate_table = sc->cur_rate_table; |
438 | struct sk_buff *skb; | 438 | struct sk_buff *skb; |
439 | struct ieee80211_tx_info *tx_info; | 439 | struct ieee80211_tx_info *tx_info; |
440 | struct ieee80211_tx_rate *rates; | 440 | struct ieee80211_tx_rate *rates; |
@@ -497,7 +497,7 @@ static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf, | |||
497 | static int ath_compute_num_delims(struct ath_softc *sc, struct ath_atx_tid *tid, | 497 | static int ath_compute_num_delims(struct ath_softc *sc, struct ath_atx_tid *tid, |
498 | struct ath_buf *bf, u16 frmlen) | 498 | struct ath_buf *bf, u16 frmlen) |
499 | { | 499 | { |
500 | struct ath_rate_table *rt = sc->cur_rate_table; | 500 | const struct ath_rate_table *rt = sc->cur_rate_table; |
501 | struct sk_buff *skb = bf->bf_mpdu; | 501 | struct sk_buff *skb = bf->bf_mpdu; |
502 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); | 502 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); |
503 | u32 nsymbits, nsymbols, mpdudensity; | 503 | u32 nsymbits, nsymbols, mpdudensity; |
@@ -971,7 +971,7 @@ int ath_cabq_update(struct ath_softc *sc) | |||
971 | else if (sc->config.cabqReadytime > ATH9K_READY_TIME_HI_BOUND) | 971 | else if (sc->config.cabqReadytime > ATH9K_READY_TIME_HI_BOUND) |
972 | sc->config.cabqReadytime = ATH9K_READY_TIME_HI_BOUND; | 972 | sc->config.cabqReadytime = ATH9K_READY_TIME_HI_BOUND; |
973 | 973 | ||
974 | qi.tqi_readyTime = (sc->hw->conf.beacon_int * | 974 | qi.tqi_readyTime = (sc->beacon_interval * |
975 | sc->config.cabqReadytime) / 100; | 975 | sc->config.cabqReadytime) / 100; |
976 | ath_txq_update(sc, qnum, &qi); | 976 | ath_txq_update(sc, qnum, &qi); |
977 | 977 | ||
@@ -1407,7 +1407,7 @@ static int setup_tx_flags(struct ath_softc *sc, struct sk_buff *skb, | |||
1407 | static u32 ath_pkt_duration(struct ath_softc *sc, u8 rix, struct ath_buf *bf, | 1407 | static u32 ath_pkt_duration(struct ath_softc *sc, u8 rix, struct ath_buf *bf, |
1408 | int width, int half_gi, bool shortPreamble) | 1408 | int width, int half_gi, bool shortPreamble) |
1409 | { | 1409 | { |
1410 | struct ath_rate_table *rate_table = sc->cur_rate_table; | 1410 | const struct ath_rate_table *rate_table = sc->cur_rate_table; |
1411 | u32 nbits, nsymbits, duration, nsymbols; | 1411 | u32 nbits, nsymbits, duration, nsymbols; |
1412 | u8 rc; | 1412 | u8 rc; |
1413 | int streams, pktlen; | 1413 | int streams, pktlen; |
@@ -1439,7 +1439,7 @@ static u32 ath_pkt_duration(struct ath_softc *sc, u8 rix, struct ath_buf *bf, | |||
1439 | 1439 | ||
1440 | static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf) | 1440 | static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf) |
1441 | { | 1441 | { |
1442 | struct ath_rate_table *rt = sc->cur_rate_table; | 1442 | const struct ath_rate_table *rt = sc->cur_rate_table; |
1443 | struct ath9k_11n_rate_series series[4]; | 1443 | struct ath9k_11n_rate_series series[4]; |
1444 | struct sk_buff *skb; | 1444 | struct sk_buff *skb; |
1445 | struct ieee80211_tx_info *tx_info; | 1445 | struct ieee80211_tx_info *tx_info; |