[PATCH] ath10k: Enable adaptive CCA

[Kennady Rajan, Maharaja]

<c_mkenna at qti.qualcomm.com> writes:

> From: Maharaja Kennadyrajan <c_mkenna at qti.qualcomm.com>
>
>> European Union has made it mandatory that all devices working in 2.4 
>> GHz has to adhere to the ETSI specification (ETSI EN 300 328 V1.9.1) 
>> beginnig this year. The standard basically speaks about interferences 
>> in 2.4Ghz band.
>> For example, when 802.11 device detects interference, TX must be 
>> stopped as long as interference is present.
>
>> Adaptive CCA is a feature, when enabled the device learns from the 
>> environment and configures CCA levels adaptively. This will improve 
>> detecting interferences and the device can stop trasmissions till the 
>> interference is present eventually leading to good performances in 
>> varying interference conditions.
>
>> The patch includes code for enabling adaptive CCA for 10.2.4 firmware 
>> on QCA988X.
>
> Signed-off-by: Maharaja Kennadyrajan <c_mkenna at qti.qualcomm.com>
> Signed-off-by: Manikanta Pubbisetty <c_mpubbi at qti.qualcomm.com>

>There are conflicts, please rebase and resend:

>Applying: ath10k: Enable adaptive CCA
>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.c
>CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi.c
>Auto-merging drivers/net/wireless/ath/ath10k/wmi-ops.h
>CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-ops.h
>Auto-merging drivers/net/wireless/ath/ath10k/mac.c
>Auto-merging drivers/net/wireless/ath/ath10k/core.h
>Failed to merge in the changes.
>Patch failed at 0001 ath10k: Enable adaptive CCA

Sure, I will resend again after rebase.

Regards,
Maha