pull request: iwlwifi 2014-09-01

PATCH New Emmanuel Grumbach 2 participants 6 messages Sep 1, 2014 – Sep 4, 2014 Networking drivers (wireless)

Share & tools

Emmanuel Grumbach

author

2014-09-01 07:11 UTC #0 lore raw

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(-)

Emmanuel Grumbach

author

2014-09-01 07:12 UTC #1 lore raw

PATCH 1/3 Revert "iwlwifi: dvm: don't enable CTS to self"

From: Emmanuel Grumbach <[email protected]>

This reverts commit 43d826ca5979927131685cc2092c7ce862cb91cd.

This commit caused packet loss.

Cc <[email protected]>

Signed-off-by Emmanuel Grumbach <[email protected]>

---
 drivers/net/wireless/iwlwifi/dvm/rxon.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

drivers/net/wireless/iwlwifi/dvm/rxon.c +12 -0

index 6dc5dd3..ed50de6 100644
@@ -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 ||

Signature · 1 line

1.9.1

Emmanuel Grumbach

author

2014-09-01 07:12 UTC #2 lore raw

PATCH 2/3 iwlwifi: Remove module build requirement for Intel Wireless WiFi

In reply to Emmanuel Grumbach

From: Marcel Holtmann <[email protected]>

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 <[email protected]>

[Squashed 2 commites for MVM and DVM]

Signed-off-by Emmanuel Grumbach <[email protected]>

---
 drivers/net/wireless/iwlwifi/Kconfig | 2 --
 1 file changed, 2 deletions(-)

drivers/net/wireless/iwlwifi/Kconfig +0 -2

index 6451d2b..824f5e2 100644
@@ -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.

Signature · 1 line

1.9.1

Emmanuel Grumbach

author

2014-09-01 07:13 UTC #3 lore raw

PATCH 3/3 iwlwifi: bump firmware API version to 10 for 7000 and 8000

In reply to Emmanuel Grumbach

From: Emmanuel Grumbach <[email protected]>

New firmware on the way.

Signed-off-by Emmanuel Grumbach <[email protected]>

---
 drivers/net/wireless/iwlwifi/iwl-7000.c | 4 ++--
 drivers/net/wireless/iwlwifi/iwl-8000.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

drivers/net/wireless/iwlwifi/iwl-7000.c +2 -2

index 4873006..d67a37a 100644
@@ -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

drivers/net/wireless/iwlwifi/iwl-8000.c +1 -1

index 44b19e0..e93c697 100644
@@ -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

Signature · 1 line

1.9.1

Emmanuel Grumbach

author

2014-09-01 17:42 UTC #4 lore raw

In reply to Emmanuel Grumbach

Quoted 6 lines · Emmanuel Grumbach

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.

Quoted 37 lines

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(-)

John W. Linville

2014-09-04 17:15 UTC #5 lore raw

In reply to Emmanuel Grumbach

Quoted 33 lines · Emmanuel Grumbach

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

Quoted 8 lines

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...

Signature · 2 lines

John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.