Michal Kazior <michal.kazior@xxxxxxxxx> writes:
> Hi,
>
> New wmi-tlv firmware will support beacon/presp
> offloading. This patchset adds appropriate
> support.
>
> These patches of mine were originally posted by
> Bartosz before christmas after I went on my
> holidays.
>
> v2:
> * add a comment in patch 5
>
>
> Michal Kazior (5):
> ath10k: implement new beacon tx status event
> ath10k: implement beacon template command
> ath10k: implement prb tmpl wmi command
> ath10k: implement p2p bcn ie command
> ath10k: implement support for ap beacon offloading
While applying this I had few trivial commits with wmi ops. Can you
double check my resolution from ath-next-test, please? (It might take an
hour before I push the patches.)
Pushing patch "ath10k-implement-new-beacon-tx" ... done
Pushing patch "ath10k-implement-beacon-templa" ...
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-tlv.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-ops.h
Error: The merge failed during "push".
Revert the operation with "stg undo".
stg rebase: 3 conflict(s)
--
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
