From: "Kennady Rajan, Maharaja" <c_mkenna@qti.qualcomm.com>
To: "Valo, Kalle" <kvalo@qca.qualcomm.com>
Cc: "linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
"ath10k@lists.infradead.org" <ath10k@lists.infradead.org>
Subject: RE: [PATCH] ath10k: Enable adaptive CCA
Date: Mon, 12 Oct 2015 05:14:08 +0000 [thread overview]
Message-ID: <e8ed6213bc5a4b458ae865bcaa23b804@APSANEXR01B.ap.qualcomm.com> (raw)
In-Reply-To: <87io6gqfgn.fsf@kamboji.qca.qualcomm.com>
<c_mkenna@qti.qualcomm.com> writes:
> From: Maharaja Kennadyrajan <c_mkenna@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@qti.qualcomm.com>
> Signed-off-by: Manikanta Pubbisetty <c_mpubbi@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
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
prev parent reply other threads:[~2015-10-12 5:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-07 9:27 [PATCH] ath10k: Enable adaptive CCA c_mkenna
2015-10-09 14:33 ` Kalle Valo
2015-10-12 5:14 ` Kennady Rajan, Maharaja [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e8ed6213bc5a4b458ae865bcaa23b804@APSANEXR01B.ap.qualcomm.com \
--to=c_mkenna@qti.qualcomm.com \
--cc=ath10k@lists.infradead.org \
--cc=kvalo@qca.qualcomm.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox