All of lore.kernel.org
 help / color / mirror / Atom feed
From: "John W. Linville" <linville@tuxdriver.com>
To: Kalle Valo <kvalo@qca.qualcomm.com>
Cc: linux-wireless@vger.kernel.org, ath10k@lists.infradead.org
Subject: Re: Pull request: ath 20131203
Date: Mon, 9 Dec 2013 15:30:57 -0500	[thread overview]
Message-ID: <20131209203057.GC3359@tuxdriver.com> (raw)
In-Reply-To: <87txep52hf.fsf@kamboji.qca.qualcomm.com>

On Tue, Dec 03, 2013 at 06:22:04PM +0200, Kalle Valo wrote:
> Hi John,
> 
> here are ath10k patches which accumulated during the merge window.
> 
> Janusz and Marek implemented DFS support to ath10k, but the code is not
> enabled yet due to missing cfg80211/mac80211 patches (it will be enabled
> in the next pull request). Michal did some device reset fixes and made
> it possible for ath10k to share an interrupt with another device. And
> lots of smaller fixes from different people.
> 
> This time there are two conflicts, one in htc.c and other in mac.c. For
> the htc change just delete the hunk. For the mac.c conflict take the
> hunk from cfb27d29b61 (the bigger one) and rename
> IEEE80211_CHAN_PASSIVE_SCAN to IEEE80211_CHAN_NO_IR. After you have
> fixed the conflicts 'git diff' should show you this:
> 
> diff --cc drivers/net/wireless/ath/ath10k/htc.c
> index edae50b,b068ae0..0000000
> --- a/drivers/net/wireless/ath/ath10k/htc.c
> +++ b/drivers/net/wireless/ath/ath10k/htc.c
> diff --cc drivers/net/wireless/ath/ath10k/mac.c
> index 06fe2b8,7d3d3ac..0000000
> --- a/drivers/net/wireless/ath/ath10k/mac.c
> +++ b/drivers/net/wireless/ath/ath10k/mac.c
> @@@ -1356,7 -1482,10 +1482,10 @@@ static int ath10k_update_channel_list(s
>                         ch->ht40plus =
>                                 !(channel->flags & IEEE80211_CHAN_NO_HT40PLUS);
>   
> +                       ch->chan_radar =
> +                               !!(channel->flags & IEEE80211_CHAN_RADAR);
> + 
>  -                      passive = channel->flags & IEEE80211_CHAN_PASSIVE_SCAN;
>  +                      passive = channel->flags & IEEE80211_CHAN_NO_IR;
>                         ch->passive = passive;
>   
>                         ch->freq = channel->center_freq;
> 
> Please let me know if you prefer me to handle the conflict differently
> or if there are any other problems with the pull request.
> 
> The following changes since commit a1b13b9ad3759dca24c6b721ee026c540a4e6564:
> 
>   rt2x00: rt2800pci: use module_pci_driver macro (2013-10-18 14:07:00 -0400)
> 
> are available in the git repository at:
> 
>   git://github.com/kvalo/ath.git tags/for-linville-20131203
> 
> for you to fetch changes up to cfb27d29b61cc32c0bb75f741aeabb9c6e6af742:
> 
>   ath10k: fix multi BSSID with WPA on FW 10.1 (2013-12-02 18:51:13 +0200)

Pulling now -- thanks for the advice on the merge fixup!

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

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

WARNING: multiple messages have this Message-ID (diff)
From: "John W. Linville" <linville@tuxdriver.com>
To: Kalle Valo <kvalo@qca.qualcomm.com>
Cc: linux-wireless@vger.kernel.org, ath10k@lists.infradead.org
Subject: Re: Pull request: ath 20131203
Date: Mon, 9 Dec 2013 15:30:57 -0500	[thread overview]
Message-ID: <20131209203057.GC3359@tuxdriver.com> (raw)
In-Reply-To: <87txep52hf.fsf@kamboji.qca.qualcomm.com>

On Tue, Dec 03, 2013 at 06:22:04PM +0200, Kalle Valo wrote:
> Hi John,
> 
> here are ath10k patches which accumulated during the merge window.
> 
> Janusz and Marek implemented DFS support to ath10k, but the code is not
> enabled yet due to missing cfg80211/mac80211 patches (it will be enabled
> in the next pull request). Michal did some device reset fixes and made
> it possible for ath10k to share an interrupt with another device. And
> lots of smaller fixes from different people.
> 
> This time there are two conflicts, one in htc.c and other in mac.c. For
> the htc change just delete the hunk. For the mac.c conflict take the
> hunk from cfb27d29b61 (the bigger one) and rename
> IEEE80211_CHAN_PASSIVE_SCAN to IEEE80211_CHAN_NO_IR. After you have
> fixed the conflicts 'git diff' should show you this:
> 
> diff --cc drivers/net/wireless/ath/ath10k/htc.c
> index edae50b,b068ae0..0000000
> --- a/drivers/net/wireless/ath/ath10k/htc.c
> +++ b/drivers/net/wireless/ath/ath10k/htc.c
> diff --cc drivers/net/wireless/ath/ath10k/mac.c
> index 06fe2b8,7d3d3ac..0000000
> --- a/drivers/net/wireless/ath/ath10k/mac.c
> +++ b/drivers/net/wireless/ath/ath10k/mac.c
> @@@ -1356,7 -1482,10 +1482,10 @@@ static int ath10k_update_channel_list(s
>                         ch->ht40plus =
>                                 !(channel->flags & IEEE80211_CHAN_NO_HT40PLUS);
>   
> +                       ch->chan_radar =
> +                               !!(channel->flags & IEEE80211_CHAN_RADAR);
> + 
>  -                      passive = channel->flags & IEEE80211_CHAN_PASSIVE_SCAN;
>  +                      passive = channel->flags & IEEE80211_CHAN_NO_IR;
>                         ch->passive = passive;
>   
>                         ch->freq = channel->center_freq;
> 
> Please let me know if you prefer me to handle the conflict differently
> or if there are any other problems with the pull request.
> 
> The following changes since commit a1b13b9ad3759dca24c6b721ee026c540a4e6564:
> 
>   rt2x00: rt2800pci: use module_pci_driver macro (2013-10-18 14:07:00 -0400)
> 
> are available in the git repository at:
> 
>   git://github.com/kvalo/ath.git tags/for-linville-20131203
> 
> for you to fetch changes up to cfb27d29b61cc32c0bb75f741aeabb9c6e6af742:
> 
>   ath10k: fix multi BSSID with WPA on FW 10.1 (2013-12-02 18:51:13 +0200)

Pulling now -- thanks for the advice on the merge fixup!

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

  reply	other threads:[~2013-12-09 20:45 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-03 16:22 Pull request: ath 20131203 Kalle Valo
2013-12-03 16:22 ` Kalle Valo
2013-12-09 20:30 ` John W. Linville [this message]
2013-12-09 20:30   ` John W. Linville

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=20131209203057.GC3359@tuxdriver.com \
    --to=linville@tuxdriver.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.