X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Fif_owl.c;h=c3a7848c3973f742d2f03bd2f000657fd12ed314;hb=b81ef731ebbbd93f13413fee0bac380333d1b5b9;hp=6a278e54916cd893f6645c0f1e0684399760df39;hpb=da738ac01b10abb0d996b32b93d9fae723a68879;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/wlan/if_owl.c b/target_firmware/wlan/if_owl.c
index 6a278e5..c3a7848 100755
--- a/target_firmware/wlan/if_owl.c
+++ b/target_firmware/wlan/if_owl.c
@@ -97,7 +97,7 @@ static a_uint16_t bits_per_symbol[][2] = {
 void owltgt_tx_processq(struct ath_softc_tgt *sc, struct ath_txq *txq,
 			owl_txq_state_t txqstate);
 static void ath_tgt_txqaddbuf(struct ath_softc_tgt *sc, struct ath_txq *txq,
-			      struct ath_buf *bf,  struct ath_desc *lastds);
+			      struct ath_tx_buf *bf,  struct ath_tx_desc *lastds);
 void ath_rate_findrate_11n_Hardcoded(struct ath_softc_tgt *sc,
 				     struct ath_rc_series series[]);
 void ath_buf_set_rate_Hardcoded(struct ath_softc_tgt *sc,
@@ -106,7 +106,7 @@ static a_int32_t ath_tgt_txbuf_setup(struct ath_softc_tgt *sc,
 				     struct ath_tx_buf *bf, ath_data_hdr_t *dh);
 static void ath_tx_freebuf(struct ath_softc_tgt *sc, struct ath_tx_buf *bf);
 static void ath_tx_uc_comp(struct ath_softc_tgt *sc, struct ath_tx_buf *bf);
-static void ath_update_stats(struct ath_softc_tgt *sc, struct ath_buf *bf);
+static void ath_update_stats(struct ath_softc_tgt *sc, struct ath_tx_buf *bf);
 void adf_print_buf(adf_nbuf_t buf);
 static void ath_tgt_tx_enqueue(struct ath_txq *txq, struct ath_atx_tid  *tid);
 
@@ -908,12 +908,8 @@ static a_int32_t ath_tgt_txbuf_setup(struct ath_softc_tgt *sc,
 				     ath_data_hdr_t *dh)
 
 {
-	struct ath_node_target *an = ATH_NODE_TARGET(bf->bf_node);
 	struct ieee80211_frame *wh = ATH_SKB2_WH(bf->bf_skb);
-	struct ieee80211_node_target *ni = (struct ieee80211_node_target *)an;
-	struct ieee80211vap_target *vap = ni->ni_vap;
-	struct ieee80211com_target *ic = &sc->sc_ic;
-	a_int32_t retval, fragno = 0;
+	a_int32_t retval;
 	a_uint32_t flags = adf_os_ntohl(dh->flags);
 
 	ath_tgt_tx_seqno_normal(bf);
@@ -955,7 +951,7 @@ ath_get_pktlen(struct ath_tx_buf *bf, a_int32_t hdrlen)
 void
 ath_tgt_tx_send_normal(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
 {
-	struct ath_node_target *an = bf->bf_node;
+	struct ath_node_target *an = ATH_NODE_TARGET(bf->bf_node);
 	struct ath_rc_series rcs[4];
 	struct ath_rc_series mrcs[4];
 	a_int32_t shortPreamble = 0;
@@ -1020,7 +1016,7 @@ ath_tx_uc_comp(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
 }
 
 static void
-ath_update_stats(struct ath_softc_tgt *sc, struct ath_buf *bf)
+ath_update_stats(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
 {
 	struct ath_tx_desc *ds = bf->bf_desc;
 	u_int32_t sr, lr;
@@ -1246,8 +1242,8 @@ fail:
 
 static void
 ath_tgt_txqaddbuf(struct ath_softc_tgt *sc,
-		  struct ath_txq *txq, struct ath_buf *bf,
-		  struct ath_desc *lastds)
+		  struct ath_txq *txq, struct ath_tx_buf *bf,
+		  struct ath_tx_desc *lastds)
 {
 	struct ath_hal *ah = sc->sc_ah;