ATH10K Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Kalle Valo <kvalo@qca.qualcomm.com>
To: Michal Kazior <michal.kazior@tieto.com>
Cc: linux-wireless@vger.kernel.org, ath10k@lists.infradead.org
Subject: Re: [PATCH v5 2/7] ath10k: implement chanctx API
Date: Mon, 30 Mar 2015 16:10:56 +0300	[thread overview]
Message-ID: <87mw2u4om7.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <1427200993-7550-3-git-send-email-michal.kazior@tieto.com> (Michal Kazior's message of "Tue, 24 Mar 2015 12:43:08 +0000")

Michal Kazior <michal.kazior@tieto.com> writes:

> The chanctx API will allow ath10k to support
> multi-channel operation.
>
> Signed-off-by: Michal Kazior <michal.kazior@tieto.com>

[...]

> @@ -1754,13 +1945,19 @@ static void ath10k_peer_assoc_h_crypto(struct ath10k *ar,
>  				       struct wmi_peer_assoc_complete_arg *arg)
>  {
>  	struct ieee80211_bss_conf *info = &vif->bss_conf;
> +	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);
> +	struct ath10k_chanctx *arctx;
>  	struct cfg80211_bss *bss;
>  	const u8 *rsnie = NULL;
>  	const u8 *wpaie = NULL;
>  
>  	lockdep_assert_held(&ar->conf_mutex);
>  
> -	bss = cfg80211_get_bss(ar->hw->wiphy, ar->hw->conf.chandef.chan,
> +	arctx = ath10k_mac_vif_ctx(arvif);
> +	if (WARN_ON(!arctx))
> +		return;
> +
> +	bss = cfg80211_get_bss(ar->hw->wiphy, arctx->conf.def.chan,
>  			       info->bssid, NULL, 0, 0, 0);

As I had to pull mac80211-next for TDLS there was a conflict here.
Please check the pending branch for my conflict resolution.

-- 
Kalle Valo

_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

  reply	other threads:[~2015-03-30 13:11 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-24 12:43 [PATCH v5 0/7] ath10k: add multi-channel support Michal Kazior
2015-03-24 12:43 ` [PATCH v5 1/7] ath10k: allow empty ssid vdev config Michal Kazior
2015-03-24 12:43 ` [PATCH v5 2/7] ath10k: implement chanctx API Michal Kazior
2015-03-30 13:10   ` Kalle Valo [this message]
2015-03-30 16:21   ` Kalle Valo
2015-03-31 10:37     ` Michal Kazior
2015-03-24 12:43 ` [PATCH v5 3/7] ath10k: implement adaptive qcs command Michal Kazior
2015-03-24 12:43 ` [PATCH v5 4/7] ath10k: rework tx queue locking Michal Kazior
2015-03-24 12:43 ` [PATCH v5 5/7] ath10k: implement tx pause wmi event Michal Kazior
2015-03-24 12:43 ` [PATCH v5 6/7] ath10k: enable multi-channel on supported devices Michal Kazior
2015-03-24 12:43 ` [PATCH v5 7/7] ath10k: allocate fw resources for iface combinations Michal Kazior

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=87mw2u4om7.fsf@kamboji.qca.qualcomm.com \
    --to=kvalo@qca.qualcomm.com \
    --cc=ath10k@lists.infradead.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=michal.kazior@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