[PATCH 10/13] ath10k: implement flushing of pending frames in txqs

[Valo, Kalle]

Michal Kazior <michal.kazior at tieto.com> writes:

> Firmware supporting pull-push tx model may request
> a switch between modes. When switching from
> pull-push to push-only it will be necessary to
> flush all pending frames. The code will do that
> once other bits that actually trigger it are added.
>
> Signed-off-by: Michal Kazior <michal.kazior at tieto.com>

This fails to apply:

fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/htt_rx.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0010 ath10k: implement flushing of pending frames in txqs

> @@ -2370,6 +2371,8 @@ static void ath10k_htt_txrx_compl_task(unsigned long ptr)
>  		dev_kfree_skb_any(skb);
>  	}
>  
> +	ath10k_mac_tx_push_pending(ar);
> +
>  	spin_lock_bh(&htt->rx_ring.lock);
>  	while ((skb = __skb_dequeue(&htt->rx_compl_q))) {
>  		resp = (struct htt_resp *)skb->data;

This hunk seems to be the problem. I could try to fix it myself but the
function has changed so I would prefer that you respin.

-- 
Kalle Valo