diff mbox

[RESEND] mwifiex: Remove custom world regulatory domain

Message ID 1403963353-27317-1-git-send-email-mpa@pengutronix.de
State Awaiting Upstream, archived
Delegated to: David Miller
Headers show

Commit Message

Markus Pargmann June 28, 2014, 1:49 p.m. UTC 
A custom regulatory domain was introduced in this commit:
cc0ba0d522c4 (mwifiex: support custom world regulatory domain)

The commit description says that it was introduced because the world
regulatory domain does not include channels 52-64 and 100-140. These
channels are described in the world regulatory domain now, so we can
drop this custom regulatory domain.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Acked-by: Bing Zhao <bzhao@marvell.com>
---
 drivers/net/wireless/mwifiex/cfg80211.c | 36 ---------------------------------
 1 file changed, 36 deletions(-)

Comments

Bing Zhao July 1, 2014, 6:18 a.m. UTC | #1 
Hi Markus,

> Subject: [PATCH RESEND] mwifiex: Remove custom world regulatory domain

This patch has been merged to wireless-next already:
http://git.kernel.org/cgit/linux/kernel/git/linville/wireless-next.git/commit/?id=7d8831bb1bfbf8db896bfc1de9d0b3bc7a8e60f0

> 
> A custom regulatory domain was introduced in this commit:
> cc0ba0d522c4 (mwifiex: support custom world regulatory domain)
> 
> The commit description says that it was introduced because the world
> regulatory domain does not include channels 52-64 and 100-140. These
> channels are described in the world regulatory domain now, so we can drop
> this custom regulatory domain.
> 
> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> Acked-by: Bing Zhao <bzhao@marvell.com>

Regards,
Bing

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Markus Pargmann July 1, 2014, 7:47 a.m. UTC | #2 
Hi Bing,

On Mon, Jun 30, 2014 at 11:18:07PM -0700, Bing Zhao wrote:
> Hi Markus,
> 
> > Subject: [PATCH RESEND] mwifiex: Remove custom world regulatory domain
> 
> This patch has been merged to wireless-next already:
> http://git.kernel.org/cgit/linux/kernel/git/linville/wireless-next.git/commit/?id=7d8831bb1bfbf8db896bfc1de9d0b3bc7a8e60f0

Thanks, I didn't notice.

Regards,

Markus
diff mbox

Patch

diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index e95dec91a561..201edbf76c81 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -42,36 +42,6 @@  static const struct ieee80211_iface_combination mwifiex_iface_comb_ap_sta = {
 	.beacon_int_infra_match = true,
 };
 
-static const struct ieee80211_regdomain mwifiex_world_regdom_custom = {
-	.n_reg_rules = 7,
-	.alpha2 =  "99",
-	.reg_rules = {
-		/* Channel 1 - 11 */
-		REG_RULE(2412-10, 2462+10, 40, 3, 20, 0),
-		/* Channel 12 - 13 */
-		REG_RULE(2467-10, 2472+10, 20, 3, 20,
-			 NL80211_RRF_NO_IR),
-		/* Channel 14 */
-		REG_RULE(2484-10, 2484+10, 20, 3, 20,
-			 NL80211_RRF_NO_IR |
-			 NL80211_RRF_NO_OFDM),
-		/* Channel 36 - 48 */
-		REG_RULE(5180-10, 5240+10, 40, 3, 20,
-			 NL80211_RRF_NO_IR),
-		/* Channel 149 - 165 */
-		REG_RULE(5745-10, 5825+10, 40, 3, 20,
-			 NL80211_RRF_NO_IR),
-		/* Channel 52 - 64 */
-		REG_RULE(5260-10, 5320+10, 40, 3, 30,
-			 NL80211_RRF_NO_IR |
-			 NL80211_RRF_DFS),
-		/* Channel 100 - 140 */
-		REG_RULE(5500-10, 5700+10, 40, 3, 30,
-			 NL80211_RRF_NO_IR |
-			 NL80211_RRF_DFS),
-	}
-};
-
 /*
  * This function maps the nl802.11 channel type into driver channel type.
  *
@@ -2916,12 +2886,6 @@  int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
 		wiphy->flags |= WIPHY_FLAG_SUPPORTS_TDLS |
 				WIPHY_FLAG_TDLS_EXTERNAL_SETUP;
 
-	wiphy->regulatory_flags |=
-			REGULATORY_CUSTOM_REG |
-			REGULATORY_STRICT_REG;
-
-	wiphy_apply_custom_regulatory(wiphy, &mwifiex_world_regdom_custom);
-
 #ifdef CONFIG_PM
 	wiphy->wowlan = &mwifiex_wowlan_support;
 #endif