use ah_fillKeyTxDesc directly
authorOleksij Rempel <linux@rempel-privat.de>
Sat, 11 May 2013 10:58:12 +0000 (12:58 +0200)
committerOleksij Rempel <linux@rempel-privat.de>
Sat, 11 May 2013 14:10:09 +0000 (16:10 +0200)
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
target_firmware/wlan/if_athvar.h
target_firmware/wlan/if_owl.c

index edcf74ced4a18ad3bab483f58658722defccefdc..bddebce7601263789dca94fb88b84e2f29b637fa 100755 (executable)
@@ -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) \
index 31a4ab4ebcaa87b5b9e84eade8a9a4fbbe314bf0..4cce3e65784acc23b5250b9a58e4b9c9b4b6dea3 100755 (executable)
@@ -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);