From: Oleksij Rempel Date: Sat, 11 May 2013 10:58:12 +0000 (+0200) Subject: use ah_fillKeyTxDesc directly X-Git-Tag: 1.4.0~12^2^2~31 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=d25160b24033ace7c0d735446eaf069b279f92e9;p=open-ath9k-htc-firmware.git use ah_fillKeyTxDesc directly Signed-off-by: Oleksij Rempel --- diff --git a/target_firmware/wlan/if_athvar.h b/target_firmware/wlan/if_athvar.h index edcf74c..bddebce 100755 --- a/target_firmware/wlan/if_athvar.h +++ b/target_firmware/wlan/if_athvar.h @@ -491,8 +491,6 @@ a_uint8_t ath_get_minrateidx(struct ath_softc_tgt *sc, struct ath_vap_target *av #define ath_hal_set11n_virtualmorefrag(_ah, _ds, _vmf) \ ((*(_ah)->ah_set11nVirtualMoreFrag)(_ah, _ds, _vmf)) -#define ath_hal_fillkeytxdesc(_ah, _ds, _keytype) \ - ((*(_ah)->ah_fillKeyTxDesc)((_ah), (_ds), (_keytype))) #define ath_hal_txprocdesc(_ah, _ds) \ ((*(_ah)->ah_procTxDesc)((_ah), (_ds))) #define ath_hal_htsupported(_ah) \ diff --git a/target_firmware/wlan/if_owl.c b/target_firmware/wlan/if_owl.c index 31a4ab4..4cce3e6 100755 --- a/target_firmware/wlan/if_owl.c +++ b/target_firmware/wlan/if_owl.c @@ -1222,8 +1222,8 @@ ath_tgt_send_mgt(struct ath_softc_tgt *sc,adf_nbuf_t hdr_buf, adf_nbuf_t skb, * in Auth frame 3 of Shared Authentication, owl needs this. */ if (iswep && (keyix != HAL_TXKEYIX_INVALID) && - (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) == IEEE80211_FC0_SUBTYPE_AUTH) - ath_hal_fillkeytxdesc(ah, ds, mh->keytype); + (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) == IEEE80211_FC0_SUBTYPE_AUTH) + ah->ah_fillKeyTxDesc(ah, ds, mh->keytype); ath_filltxdesc(sc, bf);