[PATCH 1/2] ath10k: implement sta keepalive command

[Michal Kazior]

On 28 January 2015 at 09:20, Kalle Valo <kvalo at qca.qualcomm.com> wrote:
> Michal Kazior <michal.kazior at tieto.com> writes:
>
>> From: Janusz Dziedzic <janusz.dziedzic at tieto.com>
>>
>> New wmi-tlv firmware for qca6174 has STA keepalive
>> service available. The service can provide
>> automatic idle connection polling via NullFunc
>> frames to AP when acting as a client.
>>
>> Signed-off-by: Janusz Dziedzic <janusz.dziedzic at tieto.com>
>> Signed-off-by: Michal Kazior <michal.kazior at tieto.com>
>
> I had a trivial conflict, please check my resolution from the pending
> branch:
>
> Applying: ath10k: implement sta keepalive command
> Using index info to reconstruct a base tree...
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/net/wireless/ath/ath10k/wmi.h
> Auto-merging drivers/net/wireless/ath/ath10k/wmi-tlv.h
> CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-tlv.h
> Auto-merging drivers/net/wireless/ath/ath10k/wmi-tlv.c
> CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-tlv.c
> Auto-merging drivers/net/wireless/ath/ath10k/wmi-ops.h
> CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-ops.h
> Failed to merge in the changes.
> Patch failed at 0001 ath10k: implement sta keepalive command

Looks good. Thanks!


Michał