Michal Kazior <michal.kazior@xxxxxxxxx> writes: > This adds support for the new logic where host > tells firmware how many frames are queued for each > station/tid and then firmware asks host to submit > frames for given station/tid. > > The patch count is a bit high but I tried > splitting the patches as much as possible to keep > them short and easy to review. Hopefully it's not > going to be a huge headache. > > v2: > - squashes some patches > - reworked pending frame scheduling > > > Michal Kazior (11): > ath10k: refactor tx code > ath10k: unify txpath decision > ath10k: refactor tx pending management > ath10k: maintain peer_id for each sta and vif > ath10k: add fast peer_map lookup > ath10k: add new htt message generation/parsing logic > ath10k: implement wake_tx_queue > ath10k: implement updating shared htt txq state > ath10k: store txq in skb_cb > ath10k: keep track of queue depth per txq > ath10k: implement push-pull tx I saw two conflicts, please double check my resolutions in the pending branch: Applying: ath10k: implement wake_tx_queue Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/ath/ath10k/htt_rx.c CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/htt_rx.c Auto-merging drivers/net/wireless/ath/ath10k/core.c Failed to merge in the changes. Patch failed at 0007 ath10k: implement wake_tx_queue [...] Applying: ath10k: implement push-pull tx Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/ath/ath10k/htt_rx.c CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/htt_rx.c Failed to merge in the changes. Patch failed at 0011 ath10k: implement push-pull tx -- Kalle Valo-- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
