From: Emmanuel Grumbach <egrumbach@gmail.com>
To: John Linville <linville@tuxdriver.com>
Cc: linux-wireless <linux-wireless@vger.kernel.org>
Subject: pull request: iwlwifi 2014-07-21
Date: Mon, 21 Jul 2014 21:10:13 +0300 [thread overview]
Message-ID: <53CD5785.80408@gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1166 bytes --]
Hi John,
This is a pull request for 3.16.
It includes a merge damage fix. This region has been changed in -next and -fixes quite a few times and apparently, I failed to handle it properly, so here the fix.
Along with that I have a fix from Eliad to properly handle overlapping BSS in AP mode.
Let me know if you have issues with this.
Thanks!
The following changes since commit dc271ee0d04d12d6bfabacbec803289a7072fbd9:
iwlwifi: mvm: disable CTS to Self (2014-07-03 20:55:18 +0300)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes.git master
for you to fetch changes up to 4601879419f94a89fcbf427b4d3bfbf4ce294174:
iwlwifi: mvm: pass beacons from foreign APs (2014-07-21 10:38:25 +0300)
----------------------------------------------------------------
Eliad Peller (1):
iwlwifi: mvm: pass beacons from foreign APs
Emmanuel Grumbach (1):
iwlwifi: mvm: fix merge damage
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 15 +++++++++++++--
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 7 -------
2 files changed, 13 insertions(+), 9 deletions(-)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]
next reply other threads:[~2014-07-21 18:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-21 18:10 Emmanuel Grumbach [this message]
2014-07-21 18:14 ` [PATCH 1/2] iwlwifi: mvm: fix merge damage Emmanuel Grumbach
2014-07-21 18:14 ` [PATCH 2/2] iwlwifi: mvm: pass beacons from foreign APs Emmanuel Grumbach
2014-07-22 17:22 ` pull request: iwlwifi 2014-07-21 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=53CD5785.80408@gmail.com \
--to=egrumbach@gmail.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.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).