From: Luis R. Rodriguez <mcgrof@frijolero.org>
Date: Thu, 12 Jul 2012 22:42:51 +0000 (-0700)
Subject: compat-wireless: remove linux-next-pending/0006-ath5k-*.patch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=aec17f7d25b5c4cf3ff54ca07bb945f5a6b2abef;p=openwrt%2Fstaging%2Fblogic.git

compat-wireless: remove linux-next-pending/0006-ath5k-*.patch

This is now upstream -- although the cfg80211 changes are not
yet merged.

commit 2f8684ce7a47c91da7e0ccba2686277c103d02b6
Author: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
Date:   Fri Jul 6 15:21:51 2012 -0700

    ath5k: replace modparam_all_channels with CONFIG_ATH5K_TEST_CHANNELS

    This stashes away this feature from standard kernel builds.

    Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
---

diff --git a/linux-next-pending/0006-ath5k-replace-modparam_all_channels-with-CONFIG_ATH5.patch b/linux-next-pending/0006-ath5k-replace-modparam_all_channels-with-CONFIG_ATH5.patch
deleted file mode 100644
index 2fb958016956..000000000000
--- a/linux-next-pending/0006-ath5k-replace-modparam_all_channels-with-CONFIG_ATH5.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 78931f553fff21b7b73a0eed1c05531f7d5d25f9 Mon Sep 17 00:00:00 2001
-From: "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
-Date: Wed, 20 Jun 2012 07:57:40 -0700
-Subject: [PATCH 6/7] ath5k: replace modparam_all_channels with
- CONFIG_ATH5K_TEST_CHANNELS
-
-This stashes away this feature from standard kernel builds.
-
-Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
----
- drivers/net/wireless/ath/ath5k/Kconfig |    8 ++++++++
- drivers/net/wireless/ath/ath5k/base.c  |   17 ++++++++++-------
- 2 files changed, 18 insertions(+), 7 deletions(-)
-
-diff --git a/drivers/net/wireless/ath/ath5k/Kconfig b/drivers/net/wireless/ath/ath5k/Kconfig
-index e18a9aa..338c5c4 100644
---- a/drivers/net/wireless/ath/ath5k/Kconfig
-+++ b/drivers/net/wireless/ath/ath5k/Kconfig
-@@ -64,3 +64,11 @@ config ATH5K_PCI
- 	---help---
- 	  This adds support for PCI type chipsets of the 5xxx Atheros
- 	  family.
-+
-+config ATH5K_TEST_CHANNELS
-+	bool "Enables testing channels on ath5k"
-+	depends on ATH5K && CFG80211_CERTIFICATION_ONUS
-+	---help---
-+	  This enables non-standard IEEE 802.11 channels on ath5k, which
-+	  can be used for research purposes. This option should be disabled
-+	  unless doing research.
-diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
-index 44ad6fe..8c4c040 100644
---- a/drivers/net/wireless/ath/ath5k/base.c
-+++ b/drivers/net/wireless/ath/ath5k/base.c
-@@ -74,10 +74,6 @@ bool ath5k_modparam_nohwcrypt;
- module_param_named(nohwcrypt, ath5k_modparam_nohwcrypt, bool, S_IRUGO);
- MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");
- 
--static bool modparam_all_channels;
--module_param_named(all_channels, modparam_all_channels, bool, S_IRUGO);
--MODULE_PARM_DESC(all_channels, "Expose all channels the device can use.");
--
- static bool modparam_fastchanswitch;
- module_param_named(fastchanswitch, modparam_fastchanswitch, bool, S_IRUGO);
- MODULE_PARM_DESC(fastchanswitch, "Enable fast channel switching for AR2413/AR5413 radios.");
-@@ -258,8 +254,15 @@ static int ath5k_reg_notifier(struct wiphy *wiphy, struct regulatory_request *re
- \********************/
- 
- /*
-- * Returns true for the channel numbers used without all_channels modparam.
-+ * Returns true for the channel numbers used.
-  */
-+#ifdef CONFIG_ATH5K_TEST_CHANNELS
-+static bool ath5k_is_standard_channel(short chan, enum ieee80211_band band)
-+{
-+	return true;
-+}
-+
-+#else
- static bool ath5k_is_standard_channel(short chan, enum ieee80211_band band)
- {
- 	if (band == IEEE80211_BAND_2GHZ && chan <= 14)
-@@ -276,6 +279,7 @@ static bool ath5k_is_standard_channel(short chan, enum ieee80211_band band)
- 		/* 802.11j 4.9GHz (20MHz) */
- 		(chan == 184 || chan == 188 || chan == 192 || chan == 196));
- }
-+#endif
- 
- static unsigned int
- ath5k_setup_channels(struct ath5k_hw *ah, struct ieee80211_channel *channels,
-@@ -316,8 +320,7 @@ ath5k_setup_channels(struct ath5k_hw *ah, struct ieee80211_channel *channels,
- 		if (!ath5k_channel_ok(ah, &channels[count]))
- 			continue;
- 
--		if (!modparam_all_channels &&
--		    !ath5k_is_standard_channel(ch, band))
-+		if (!ath5k_is_standard_channel(ch, band))
- 			continue;
- 
- 		count++;
--- 
-1.7.10.rc1.22.gf5241
-