* pull request: iwlwifi 2014-09-01
@ 2014-09-01 7:11 Emmanuel Grumbach
2014-09-01 7:12 ` [PATCH 1/3] Revert "iwlwifi: dvm: don't enable CTS to self" Emmanuel Grumbach
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Emmanuel Grumbach @ 2014-09-01 7:11 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless, ilw
[-- Attachment #1: Type: text/plain, Size: 1753 bytes --]
Hi John,
I just came back from a long period of travels and I am really just starting to catch up.
So this is the first pull request with various things that piled up, but I am really only
in the middle of the patch list. I still wanted to send now these since they have been
waiting for a while already.
I revert a patch that disabled CTS to self in dvm because users reported issues. The revert
is CCed to stable since the offending patch was sent to stable too. I also bump the firmware
API versions since a new firmware is coming up. On top of that, Marcel fixes a bug I introduced
while fixing a bug in our Kconfig file.
Please pull and let me know if you have issues.
Thanks!
The following changes since commit 77b2f2865956b7573f9b040db7a9f808b434acd1:
iwlwifi: mvm: disable scheduled scan to prevent firmware crash (2014-08-14 19:47:41 +0300)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes.git for-john
for you to fetch changes up to d88c8958dc13b4e4eb7fc57e3f06dc1c4abc7b1f:
iwlwifi: bump firmware API version to 10 for 7000 and 8000 (2014-09-01 09:50:14 +0300)
----------------------------------------------------------------
Emmanuel Grumbach (2):
Revert "iwlwifi: dvm: don't enable CTS to self"
iwlwifi: bump firmware API version to 10 for 7000 and 8000
Marcel Holtmann (1):
iwlwifi: Remove module build requirement for Intel Wireless WiFi
drivers/net/wireless/iwlwifi/Kconfig | 2 --
drivers/net/wireless/iwlwifi/dvm/rxon.c | 12 ++++++++++++
drivers/net/wireless/iwlwifi/iwl-7000.c | 4 ++--
drivers/net/wireless/iwlwifi/iwl-8000.c | 2 +-
4 files changed, 15 insertions(+), 5 deletions(-)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/3] Revert "iwlwifi: dvm: don't enable CTS to self"
2014-09-01 7:11 pull request: iwlwifi 2014-09-01 Emmanuel Grumbach
@ 2014-09-01 7:12 ` Emmanuel Grumbach
2014-09-01 7:12 ` [PATCH 2/3] iwlwifi: Remove module build requirement for Intel Wireless WiFi Emmanuel Grumbach
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Emmanuel Grumbach @ 2014-09-01 7:12 UTC (permalink / raw)
To: linux-wireless; +Cc: Emmanuel Grumbach, stable
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This reverts commit 43d826ca5979927131685cc2092c7ce862cb91cd.
This commit caused packet loss.
Cc: <stable@vger.kernel.org>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/dvm/rxon.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/drivers/net/wireless/iwlwifi/dvm/rxon.c b/drivers/net/wireless/iwlwifi/dvm/rxon.c
index 6dc5dd3..ed50de6 100644
--- a/drivers/net/wireless/iwlwifi/dvm/rxon.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rxon.c
@@ -1068,6 +1068,13 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
/* recalculate basic rates */
iwl_calc_basic_rates(priv, ctx);
+ /*
+ * force CTS-to-self frames protection if RTS-CTS is not preferred
+ * one aggregation protection method
+ */
+ if (!priv->hw_params.use_rts_for_aggregation)
+ ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;
+
if ((ctx->vif && ctx->vif->bss_conf.use_short_slot) ||
!(ctx->staging.flags & RXON_FLG_BAND_24G_MSK))
ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;
@@ -1473,6 +1480,11 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
else
ctx->staging.flags &= ~RXON_FLG_TGG_PROTECT_MSK;
+ if (bss_conf->use_cts_prot)
+ ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;
+ else
+ ctx->staging.flags &= ~RXON_FLG_SELF_CTS_EN;
+
memcpy(ctx->staging.bssid_addr, bss_conf->bssid, ETH_ALEN);
if (vif->type == NL80211_IFTYPE_AP ||
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] iwlwifi: Remove module build requirement for Intel Wireless WiFi
2014-09-01 7:11 pull request: iwlwifi 2014-09-01 Emmanuel Grumbach
2014-09-01 7:12 ` [PATCH 1/3] Revert "iwlwifi: dvm: don't enable CTS to self" Emmanuel Grumbach
@ 2014-09-01 7:12 ` Emmanuel Grumbach
2014-09-01 7:12 ` [PATCH 3/3] iwlwifi: bump firmware API version to 10 for 7000 and 8000 Emmanuel Grumbach
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Emmanuel Grumbach @ 2014-09-01 7:12 UTC (permalink / raw)
To: linux-wireless; +Cc: Marcel Holtmann, Emmanuel Grumbach
From: Marcel Holtmann <marcel@holtmann.org>
The CONFIG_IWLDVM and CONFIG_IWLMVM currently have a
"depends on m" as its requirement forcing it to be build
as module. This is not needed and thus just remove it.
Fixes: ae7486a2b734 ("iwlwifi: fix Kconfig issues")
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
[Squashed 2 commites for MVM and DVM]
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/Kconfig | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index 6451d2b..824f5e2 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -51,7 +51,6 @@ config IWLWIFI_LEDS
config IWLDVM
tristate "Intel Wireless WiFi DVM Firmware support"
- depends on m
default IWLWIFI
help
This is the driver that supports the DVM firmware which is
@@ -60,7 +59,6 @@ config IWLDVM
config IWLMVM
tristate "Intel Wireless WiFi MVM Firmware support"
- depends on m
help
This is the driver that supports the MVM firmware which is
currently only available for 7260 and 3160 devices.
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] iwlwifi: bump firmware API version to 10 for 7000 and 8000
2014-09-01 7:11 pull request: iwlwifi 2014-09-01 Emmanuel Grumbach
2014-09-01 7:12 ` [PATCH 1/3] Revert "iwlwifi: dvm: don't enable CTS to self" Emmanuel Grumbach
2014-09-01 7:12 ` [PATCH 2/3] iwlwifi: Remove module build requirement for Intel Wireless WiFi Emmanuel Grumbach
@ 2014-09-01 7:12 ` Emmanuel Grumbach
2014-09-01 17:41 ` pull request: iwlwifi 2014-09-01 Emmanuel Grumbach
2014-09-04 17:12 ` John W. Linville
4 siblings, 0 replies; 6+ messages in thread
From: Emmanuel Grumbach @ 2014-09-01 7:12 UTC (permalink / raw)
To: linux-wireless; +Cc: Emmanuel Grumbach
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
New firmware on the way.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/iwl-7000.c | 4 ++--
drivers/net/wireless/iwlwifi/iwl-8000.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-7000.c b/drivers/net/wireless/iwlwifi/iwl-7000.c
index 4873006..d67a37a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-7000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-7000.c
@@ -67,8 +67,8 @@
#include "iwl-agn-hw.h"
/* Highest firmware API version supported */
-#define IWL7260_UCODE_API_MAX 9
-#define IWL3160_UCODE_API_MAX 9
+#define IWL7260_UCODE_API_MAX 10
+#define IWL3160_UCODE_API_MAX 10
/* Oldest version we won't warn about */
#define IWL7260_UCODE_API_OK 9
diff --git a/drivers/net/wireless/iwlwifi/iwl-8000.c b/drivers/net/wireless/iwlwifi/iwl-8000.c
index 44b19e0..e93c697 100644
--- a/drivers/net/wireless/iwlwifi/iwl-8000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-8000.c
@@ -67,7 +67,7 @@
#include "iwl-agn-hw.h"
/* Highest firmware API version supported */
-#define IWL8000_UCODE_API_MAX 9
+#define IWL8000_UCODE_API_MAX 10
/* Oldest version we won't warn about */
#define IWL8000_UCODE_API_OK 8
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: pull request: iwlwifi 2014-09-01
2014-09-01 7:11 pull request: iwlwifi 2014-09-01 Emmanuel Grumbach
` (2 preceding siblings ...)
2014-09-01 7:12 ` [PATCH 3/3] iwlwifi: bump firmware API version to 10 for 7000 and 8000 Emmanuel Grumbach
@ 2014-09-01 17:41 ` Emmanuel Grumbach
2014-09-04 17:12 ` John W. Linville
4 siblings, 0 replies; 6+ messages in thread
From: Emmanuel Grumbach @ 2014-09-01 17:41 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless, ilw
On 09/01/2014 10:11 AM, Emmanuel Grumbach wrote:
> Hi John,
>
> I just came back from a long period of travels and I am really just starting to catch up.
> So this is the first pull request with various things that piled up, but I am really only
> in the middle of the patch list. I still wanted to send now these since they have been
> waiting for a while already.
I forgot to say that this is meant for 3.17. Thanks.
>
> I revert a patch that disabled CTS to self in dvm because users reported issues. The revert
> is CCed to stable since the offending patch was sent to stable too. I also bump the firmware
> API versions since a new firmware is coming up. On top of that, Marcel fixes a bug I introduced
> while fixing a bug in our Kconfig file.
>
> Please pull and let me know if you have issues.
> Thanks!
>
>
> The following changes since commit 77b2f2865956b7573f9b040db7a9f808b434acd1:
>
> iwlwifi: mvm: disable scheduled scan to prevent firmware crash (2014-08-14 19:47:41 +0300)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes.git for-john
>
> for you to fetch changes up to d88c8958dc13b4e4eb7fc57e3f06dc1c4abc7b1f:
>
> iwlwifi: bump firmware API version to 10 for 7000 and 8000 (2014-09-01 09:50:14 +0300)
>
> ----------------------------------------------------------------
> Emmanuel Grumbach (2):
> Revert "iwlwifi: dvm: don't enable CTS to self"
> iwlwifi: bump firmware API version to 10 for 7000 and 8000
>
> Marcel Holtmann (1):
> iwlwifi: Remove module build requirement for Intel Wireless WiFi
>
> drivers/net/wireless/iwlwifi/Kconfig | 2 --
> drivers/net/wireless/iwlwifi/dvm/rxon.c | 12 ++++++++++++
> drivers/net/wireless/iwlwifi/iwl-7000.c | 4 ++--
> drivers/net/wireless/iwlwifi/iwl-8000.c | 2 +-
> 4 files changed, 15 insertions(+), 5 deletions(-)
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pull request: iwlwifi 2014-09-01
2014-09-01 7:11 pull request: iwlwifi 2014-09-01 Emmanuel Grumbach
` (3 preceding siblings ...)
2014-09-01 17:41 ` pull request: iwlwifi 2014-09-01 Emmanuel Grumbach
@ 2014-09-04 17:12 ` John W. Linville
4 siblings, 0 replies; 6+ messages in thread
From: John W. Linville @ 2014-09-04 17:12 UTC (permalink / raw)
To: Emmanuel Grumbach; +Cc: linux-wireless, ilw
On Mon, Sep 01, 2014 at 10:11:15AM +0300, Emmanuel Grumbach wrote:
> Hi John,
>
> I just came back from a long period of travels and I am really just starting to catch up.
> So this is the first pull request with various things that piled up, but I am really only
> in the middle of the patch list. I still wanted to send now these since they have been
> waiting for a while already.
>
> I revert a patch that disabled CTS to self in dvm because users reported issues. The revert
> is CCed to stable since the offending patch was sent to stable too. I also bump the firmware
> API versions since a new firmware is coming up. On top of that, Marcel fixes a bug I introduced
> while fixing a bug in our Kconfig file.
>
> Please pull and let me know if you have issues.
> Thanks!
>
>
> The following changes since commit 77b2f2865956b7573f9b040db7a9f808b434acd1:
>
> iwlwifi: mvm: disable scheduled scan to prevent firmware crash (2014-08-14 19:47:41 +0300)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes.git for-john
>
> for you to fetch changes up to d88c8958dc13b4e4eb7fc57e3f06dc1c4abc7b1f:
>
> iwlwifi: bump firmware API version to 10 for 7000 and 8000 (2014-09-01 09:50:14 +0300)
>
> ----------------------------------------------------------------
> Emmanuel Grumbach (2):
> Revert "iwlwifi: dvm: don't enable CTS to self"
> iwlwifi: bump firmware API version to 10 for 7000 and 8000
>
> Marcel Holtmann (1):
> iwlwifi: Remove module build requirement for Intel Wireless WiFi
>
> drivers/net/wireless/iwlwifi/Kconfig | 2 --
> drivers/net/wireless/iwlwifi/dvm/rxon.c | 12 ++++++++++++
> drivers/net/wireless/iwlwifi/iwl-7000.c | 4 ++--
> drivers/net/wireless/iwlwifi/iwl-8000.c | 2 +-
> 4 files changed, 15 insertions(+), 5 deletions(-)
Pulling now...
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-09-04 17:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-01 7:11 pull request: iwlwifi 2014-09-01 Emmanuel Grumbach
2014-09-01 7:12 ` [PATCH 1/3] Revert "iwlwifi: dvm: don't enable CTS to self" Emmanuel Grumbach
2014-09-01 7:12 ` [PATCH 2/3] iwlwifi: Remove module build requirement for Intel Wireless WiFi Emmanuel Grumbach
2014-09-01 7:12 ` [PATCH 3/3] iwlwifi: bump firmware API version to 10 for 7000 and 8000 Emmanuel Grumbach
2014-09-01 17:41 ` pull request: iwlwifi 2014-09-01 Emmanuel Grumbach
2014-09-04 17:12 ` John W. Linville
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).