projects
/
open-ath9k-htc-firmware.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use ah_set11nAggrFirst directly
[open-ath9k-htc-firmware.git]
/
target_firmware
/
wlan
/
if_owl.c
diff --git
a/target_firmware/wlan/if_owl.c
b/target_firmware/wlan/if_owl.c
index 40721cde3785ae3982a5fb1e499ac44b5c4afed1..5a06c599f7f2046ad32c383b6bdc35ecb7c4be70 100755
(executable)
--- a/
target_firmware/wlan/if_owl.c
+++ b/
target_firmware/wlan/if_owl.c
@@
-47,7
+47,6
@@
#include <adf_net.h>
#include <adf_net_wcmd.h>
#include <adf_net.h>
#include <adf_net_wcmd.h>
-#include "if_ethersubr.h"
#include "if_llc.h"
#ifdef USE_HEADERLEN_RESV
#include "if_llc.h"
#ifdef USE_HEADERLEN_RESV
@@
-58,7
+57,6
@@
#include "if_athrate.h"
#include "if_athvar.h"
#include "ah_desc.h"
#include "if_athrate.h"
#include "if_athvar.h"
#include "ah_desc.h"
-#include "if_ath_pci.h"
#define ath_tgt_free_skb adf_nbuf_free
#define ath_tgt_free_skb adf_nbuf_free
@@
-265,6
+263,7
@@
static void ath_filltxdesc(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
static void ath_tx_tgt_setds(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
{
struct ath_tx_desc *ds = bf->bf_desc;
static void ath_tx_tgt_setds(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
{
struct ath_tx_desc *ds = bf->bf_desc;
+ struct ath_hal *ah = sc->sc_ah;
switch (bf->bf_protmode) {
case IEEE80211_PROT_RTSCTS:
switch (bf->bf_protmode) {
case IEEE80211_PROT_RTSCTS:
@@
-277,7
+276,7
@@
static void ath_tx_tgt_setds(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
break;
}
break;
}
- a
th_hal_set11n_txdesc(sc->sc_
ah, ds
+ a
h->ah_set11nTxDesc(
ah, ds
, bf->bf_pktlen
, bf->bf_atype
, 60
, bf->bf_pktlen
, bf->bf_atype
, 60
@@
-444,7
+443,7
@@
static void ath_buf_set_rate(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
rtsctsrate = rt->info[cix].rateCode |
(bf->bf_shpream ? rt->info[cix].shortPreamble : 0);
rtsctsrate = rt->info[cix].rateCode |
(bf->bf_shpream ? rt->info[cix].shortPreamble : 0);
- a
th_hal_set11n_rates
cenario(ah, ds, 1,
+ a
h->ah_set11nRateS
cenario(ah, ds, 1,
rtsctsrate, ctsduration,
series, 4,
flags);
rtsctsrate, ctsduration,
series, 4,
flags);
@@
-618,9
+617,10
@@
void ath_tx_status_send(struct ath_softc_tgt *sc)
static void owltgt_tx_process_cabq(struct ath_softc_tgt *sc, struct ath_txq *txq)
{
static void owltgt_tx_process_cabq(struct ath_softc_tgt *sc, struct ath_txq *txq)
{
- ath_hal_intrset(sc->sc_ah, sc->sc_imask & ~HAL_INT_SWBA);
+ struct ath_hal *ah = sc->sc_ah;
+ ah->ah_setInterrupts(ah, sc->sc_imask & ~HAL_INT_SWBA);
owltgt_tx_processq(sc, txq, OWL_TXQ_ACTIVE);
owltgt_tx_processq(sc, txq, OWL_TXQ_ACTIVE);
- a
th_hal_intrset(sc->sc_
ah, sc->sc_imask);
+ a
h->ah_setInterrupts(
ah, sc->sc_imask);
}
void owl_tgt_tx_tasklet(TQUEUE_ARG data)
}
void owl_tgt_tx_tasklet(TQUEUE_ARG data)
@@
-890,17
+890,17
@@
static void ath_tgt_txq_add_ucast(struct ath_softc_tgt *sc, struct ath_tx_buf *b
ATH_TXQ_INSERT_TAIL(txq, bf, bf_list);
if (txq->axq_link == NULL) {
ATH_TXQ_INSERT_TAIL(txq, bf, bf_list);
if (txq->axq_link == NULL) {
- a
th_hal_puttxbuf
(ah, txq->axq_qnum, ATH_BUF_GET_DESC_PHY_ADDR(bf));
+ a
h->ah_setTxDP
(ah, txq->axq_qnum, ATH_BUF_GET_DESC_PHY_ADDR(bf));
} else {
*txq->axq_link = ATH_BUF_GET_DESC_PHY_ADDR(bf);
txe_val = OS_REG_READ(ah, 0x840);
if (!(txe_val & (1<< txq->axq_qnum)))
} else {
*txq->axq_link = ATH_BUF_GET_DESC_PHY_ADDR(bf);
txe_val = OS_REG_READ(ah, 0x840);
if (!(txe_val & (1<< txq->axq_qnum)))
- a
th_hal_puttxbuf
(ah, txq->axq_qnum, ATH_BUF_GET_DESC_PHY_ADDR(bf));
+ a
h->ah_setTxDP
(ah, txq->axq_qnum, ATH_BUF_GET_DESC_PHY_ADDR(bf));
}
txq->axq_link = &bf->bf_lastds->ds_link;
}
txq->axq_link = &bf->bf_lastds->ds_link;
- a
th_hal_txstart
(ah, txq->axq_qnum);
+ a
h->ah_startTxDma
(ah, txq->axq_qnum);
}
static a_int32_t ath_tgt_txbuf_setup(struct ath_softc_tgt *sc,
}
static a_int32_t ath_tgt_txbuf_setup(struct ath_softc_tgt *sc,
@@
-1231,7
+1231,7
@@
ath_tgt_send_mgt(struct ath_softc_tgt *sc,adf_nbuf_t hdr_buf, adf_nbuf_t skb,
series[i].ChSel = sc->sc_ic.ic_tx_chainmask;
series[i].RateFlags = 0;
}
series[i].ChSel = sc->sc_ic.ic_tx_chainmask;
series[i].RateFlags = 0;
}
- a
th_hal_set11n_rates
cenario(ah, ds, 0, ctsrate, ctsduration, series, 4, 0);
+ a
h->ah_set11nRateS
cenario(ah, ds, 0, ctsrate, ctsduration, series, 4, 0);
ath_tgt_txqaddbuf(sc, txq, bf, bf->bf_lastds);
return;
ath_tgt_txqaddbuf(sc, txq, bf, bf->bf_lastds);
return;
@@
-1250,13
+1250,13
@@
ath_tgt_txqaddbuf(struct ath_softc_tgt *sc,
ATH_TXQ_INSERT_TAIL(txq, bf, bf_list);
if (txq->axq_link == NULL) {
ATH_TXQ_INSERT_TAIL(txq, bf, bf_list);
if (txq->axq_link == NULL) {
- a
th_hal_puttxbuf
(ah, txq->axq_qnum, ATH_BUF_GET_DESC_PHY_ADDR(bf));
+ a
h->ah_setTxDP
(ah, txq->axq_qnum, ATH_BUF_GET_DESC_PHY_ADDR(bf));
} else {
*txq->axq_link = ATH_BUF_GET_DESC_PHY_ADDR(bf);
}
txq->axq_link = &lastds->ds_link;
} else {
*txq->axq_link = ATH_BUF_GET_DESC_PHY_ADDR(bf);
}
txq->axq_link = &lastds->ds_link;
- a
th_hal_txstart
(ah, txq->axq_qnum);
+ a
h->ah_startTxDma
(ah, txq->axq_qnum);
}
void ath_tgt_handle_normal(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
}
void ath_tgt_handle_normal(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
@@
-1379,6
+1379,7
@@
ath_tgt_tx_sched_aggr(struct ath_softc_tgt *sc, ath_atx_tid_t *tid)
ath_tx_bufhead bf_q;
struct ath_txq *txq = TID_TO_ACTXQ(tid->tidno);
struct ath_tx_desc *ds = NULL;
ath_tx_bufhead bf_q;
struct ath_txq *txq = TID_TO_ACTXQ(tid->tidno);
struct ath_tx_desc *ds = NULL;
+ struct ath_hal *ah = sc->sc_ah;
int i;
int i;
@@
-1423,7
+1424,7
@@
ath_tgt_tx_sched_aggr(struct ath_softc_tgt *sc, ath_atx_tid_t *tid)
bf->bf_isaggr = 1;
ath_buf_set_rate(sc, bf);
bf->bf_isaggr = 1;
ath_buf_set_rate(sc, bf);
- a
th_hal_set11n_aggr_first(sc->sc_
ah, bf->bf_desc, bf->bf_al,
+ a
h->ah_set11nAggrFirst(
ah, bf->bf_desc, bf->bf_al,
bf->bf_ndelim);
bf->bf_lastds = bf_last->bf_lastds;
bf->bf_ndelim);
bf->bf_lastds = bf_last->bf_lastds;
@@
-2081,6
+2082,7
@@
static void ath_bar_tx(struct ath_softc_tgt *sc,
struct ieee80211_frame_bar *bar;
u_int8_t min_rate;
struct ath_tx_desc *ds, *ds0;
struct ieee80211_frame_bar *bar;
u_int8_t min_rate;
struct ath_tx_desc *ds, *ds0;
+ struct ath_hal *ah = sc->sc_ah;
HAL_11N_RATE_SERIES series[4];
int i = 0;
adf_nbuf_queue_t skbhead;
HAL_11N_RATE_SERIES series[4];
int i = 0;
adf_nbuf_queue_t skbhead;
@@
-2152,6
+2154,6
@@
static void ath_bar_tx(struct ath_softc_tgt *sc,
series[i].ChSel = sc->sc_ic.ic_tx_chainmask;
}
series[i].ChSel = sc->sc_ic.ic_tx_chainmask;
}
- a
th_hal_set11n_ratescenario(sc->sc_
ah, bf->bf_desc, 0, 0, 0, series, 4, 4);
+ a
h->ah_set11nRateScenario(
ah, bf->bf_desc, 0, 0, 0, series, 4, 4);
ath_tgt_txq_add_ucast(sc, bf);
}
ath_tgt_txq_add_ucast(sc, bf);
}