|
@@ -3528,7 +3528,6 @@ static int ath10k_mac_tx_submit(struct ath10k *ar,
|
|
*/
|
|
*/
|
|
static int ath10k_mac_tx(struct ath10k *ar,
|
|
static int ath10k_mac_tx(struct ath10k *ar,
|
|
struct ieee80211_vif *vif,
|
|
struct ieee80211_vif *vif,
|
|
- struct ieee80211_sta *sta,
|
|
|
|
enum ath10k_hw_txrx_mode txmode,
|
|
enum ath10k_hw_txrx_mode txmode,
|
|
enum ath10k_mac_tx_path txpath,
|
|
enum ath10k_mac_tx_path txpath,
|
|
struct sk_buff *skb)
|
|
struct sk_buff *skb)
|
|
@@ -3670,7 +3669,7 @@ void ath10k_offchan_tx_work(struct work_struct *work)
|
|
txmode = ath10k_mac_tx_h_get_txmode(ar, vif, sta, skb);
|
|
txmode = ath10k_mac_tx_h_get_txmode(ar, vif, sta, skb);
|
|
txpath = ath10k_mac_tx_h_get_txpath(ar, skb, txmode);
|
|
txpath = ath10k_mac_tx_h_get_txpath(ar, skb, txmode);
|
|
|
|
|
|
- ret = ath10k_mac_tx(ar, vif, sta, txmode, txpath, skb);
|
|
|
|
|
|
+ ret = ath10k_mac_tx(ar, vif, txmode, txpath, skb);
|
|
if (ret) {
|
|
if (ret) {
|
|
ath10k_warn(ar, "failed to transmit offchannel frame: %d\n",
|
|
ath10k_warn(ar, "failed to transmit offchannel frame: %d\n",
|
|
ret);
|
|
ret);
|
|
@@ -3857,7 +3856,7 @@ int ath10k_mac_tx_push_txq(struct ieee80211_hw *hw,
|
|
spin_unlock_bh(&ar->htt.tx_lock);
|
|
spin_unlock_bh(&ar->htt.tx_lock);
|
|
}
|
|
}
|
|
|
|
|
|
- ret = ath10k_mac_tx(ar, vif, sta, txmode, txpath, skb);
|
|
|
|
|
|
+ ret = ath10k_mac_tx(ar, vif, txmode, txpath, skb);
|
|
if (unlikely(ret)) {
|
|
if (unlikely(ret)) {
|
|
ath10k_warn(ar, "failed to push frame: %d\n", ret);
|
|
ath10k_warn(ar, "failed to push frame: %d\n", ret);
|
|
|
|
|
|
@@ -4138,7 +4137,7 @@ static void ath10k_mac_op_tx(struct ieee80211_hw *hw,
|
|
spin_unlock_bh(&ar->htt.tx_lock);
|
|
spin_unlock_bh(&ar->htt.tx_lock);
|
|
}
|
|
}
|
|
|
|
|
|
- ret = ath10k_mac_tx(ar, vif, sta, txmode, txpath, skb);
|
|
|
|
|
|
+ ret = ath10k_mac_tx(ar, vif, txmode, txpath, skb);
|
|
if (ret) {
|
|
if (ret) {
|
|
ath10k_warn(ar, "failed to transmit frame: %d\n", ret);
|
|
ath10k_warn(ar, "failed to transmit frame: %d\n", ret);
|
|
if (is_htt) {
|
|
if (is_htt) {
|