From: Kalle Valo <kvalo@qca.qualcomm.com>
To: Marek Puzyniak <marek.puzyniak@tieto.com>
Cc: "linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
"ath10k@lists.infradead.org" <ath10k@lists.infradead.org>
Subject: Re: [PATCH v4 5/6] ath10k: add wmi support for tdls
Date: Tue, 24 Mar 2015 10:50:28 +0200 [thread overview]
Message-ID: <874mpadbjf.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <CADnKcVizKNOJwhc9a=XfPUZfEM3V+QJ59sK0oorWK-b3jeKRyA@mail.gmail.com> (Marek Puzyniak's message of "Tue, 24 Mar 2015 03:33:28 -0400")
Marek Puzyniak <marek.puzyniak@tieto.com> writes:
> On 23 March 2015 at 11:53, Kalle Valo <kvalo@qca.qualcomm.com> wrote:
>> Marek Puzyniak <marek.puzyniak@tieto.com> writes:
>>
>>> As a part of tdls implementation introduce
>>> tdls related wmi data structures, constant
>>> values and functions.
>>>
>>> Signed-off-by: Marek Puzyniak <marek.puzyniak@tieto.com>
>>
>> This patch had non-trivial conflicts, please check carefully my
>> resolution in the pending branch.
>>
>> CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi.h
>> CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-tlv.h
>> 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
>>
>> --
>> Kalle Valo
>
> It looks OK, but there is one small thing in file
> drivers/net/wireless/ath/ath10k/wmi-tlv.c.
> There are two new lines between functions ath10k_wmi_tlv_op_gen_tdls_peer_update
> and ath10k_wmi_tlv_op_gen_wow_enable.
Thanks, fixed now.
--
Kalle Valo
next prev parent reply other threads:[~2015-03-24 8:50 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-20 11:02 [PATCH v4 0/6] ath10k: add basic tdls support Marek Puzyniak
2015-03-20 11:02 ` [PATCH v4 1/6] ath10k: unify tx mode and dispatch Marek Puzyniak
2015-03-26 9:27 ` Michal Kazior
2015-03-26 10:03 ` Michal Kazior
2015-03-27 12:41 ` Kalle Valo
2015-03-20 11:02 ` [PATCH v4 2/6] ath10k: make peer type configurable Marek Puzyniak
2015-03-20 11:02 ` [PATCH v4 3/6] ath10k: store max tdls vdevs that fw can handle Marek Puzyniak
2015-03-20 11:02 ` [PATCH v4 4/6] ath10k: update station counting Marek Puzyniak
2015-03-20 11:02 ` [PATCH v4 5/6] ath10k: add wmi support for tdls Marek Puzyniak
2015-03-22 7:49 ` Arik Nemtsov
2015-03-23 8:09 ` Michal Kazior
2015-03-23 8:59 ` Marek Puzyniak
2015-03-23 9:46 ` Arik Nemtsov
2015-03-23 15:53 ` Kalle Valo
2015-03-24 7:33 ` Marek Puzyniak
2015-03-24 8:50 ` Kalle Valo [this message]
2015-03-20 11:02 ` [PATCH v4 6/6] ath10k: introduce basic tdls functionality Marek Puzyniak
2015-03-27 14:33 ` Marek Puzyniak
2015-03-27 17:43 ` Kalle Valo
2015-03-30 12:06 ` [PATCH v4 0/6] ath10k: add basic tdls support Kalle Valo
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=874mpadbjf.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@qca.qualcomm.com \
--cc=ath10k@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=marek.puzyniak@tieto.com \
/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;
as well as URLs for NNTP newsgroup(s).