Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

author: John W. Linville <linville@tuxdriver.com> 2013-12-02 14:25:38 -0500
committer: John W. Linville <linville@tuxdriver.com> 2013-12-02 14:25:38 -0500
commit: 4b074b07625f603d40d4d04937f8874a00415dc4 (patch)
tree: 2dffdc46e3fea0320524f483cf5ac2c058ab59f2 /drivers/net/wireless/iwlegacy
parent: 7d68849f40cd9169088249cc889d95c8998c3fb8 (diff)
parent: ddcc347b70f298f9d624cd0e250581d831d915fb (diff)
4 files changed, 14 insertions, 14 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
index dea3b50d68b9..5c3bcedd679b 100644
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -1595,7 +1595,7 @@ il3945_get_channels_for_scan(struct il_priv *il, enum ieee80211_band band,
                 *  and use long active_dwell time.
                 */
                if (!is_active || il_is_channel_passive(ch_info) ||
-                    (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN)) {
+                    (chan->flags & IEEE80211_CHAN_NO_IR)) {
                        scan_ch->type = 0;      /* passive */
                        if (IL_UCODE_API(il->ucode_ver) == 1)
                                scan_ch->active_dwell =
@@ -3575,9 +3575,9 @@ il3945_setup_mac(struct il_priv *il)
        hw->wiphy->interface_modes =
            BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
-        hw->wiphy->flags |=
+        hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
-            WIPHY_FLAG_CUSTOM_REGULATORY | WIPHY_FLAG_DISABLE_BEACON_HINTS |
+        hw->wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG |
-            WIPHY_FLAG_IBSS_RSN;
+                                       REGULATORY_DISABLE_BEACON_HINTS;
        hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index 3982ab76f375..43f488a8cda2 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -805,7 +805,7 @@ il4965_get_channels_for_scan(struct il_priv *il, struct ieee80211_vif *vif,
                }
                if (!is_active || il_is_channel_passive(ch_info) ||
-                    (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN))
+                    (chan->flags & IEEE80211_CHAN_NO_IR))
                        scan_ch->type = SCAN_CHANNEL_TYPE_PASSIVE;
                else
                        scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE;
@@ -5778,9 +5778,9 @@ il4965_mac_setup_register(struct il_priv *il, u32 max_probe_length)
        hw->wiphy->interface_modes =
            BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
-        hw->wiphy->flags |=
+        hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
-            WIPHY_FLAG_CUSTOM_REGULATORY | WIPHY_FLAG_DISABLE_BEACON_HINTS |
+        hw->wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG |
-            WIPHY_FLAG_IBSS_RSN;
+                                       REGULATORY_DISABLE_BEACON_HINTS;
        /*
         * For now, disable PS by default because it affects
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index b03e22ef5462..a27b14cfeaec 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -3445,10 +3445,10 @@ il_init_geos(struct il_priv *il)
                if (il_is_channel_valid(ch)) {
                        if (!(ch->flags & EEPROM_CHANNEL_IBSS))
-                                geo_ch->flags |= IEEE80211_CHAN_NO_IBSS;
+                                geo_ch->flags |= IEEE80211_CHAN_NO_IR;
                        if (!(ch->flags & EEPROM_CHANNEL_ACTIVE))
-                                geo_ch->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
+                                geo_ch->flags |= IEEE80211_CHAN_NO_IR;
                        if (ch->flags & EEPROM_CHANNEL_RADAR)
                                geo_ch->flags |= IEEE80211_CHAN_RADAR;
diff --git a/drivers/net/wireless/iwlegacy/debug.c b/drivers/net/wireless/iwlegacy/debug.c
index eff26501d60a..3a487a3bb5de 100644
--- a/drivers/net/wireless/iwlegacy/debug.c
+++ b/drivers/net/wireless/iwlegacy/debug.c
@@ -567,12 +567,12 @@ il_dbgfs_channels_read(struct file *file, char __user *user_buf, size_t count,
                                      flags & IEEE80211_CHAN_RADAR ?
                                      " (IEEE 802.11h required)" : "",
                                      ((channels[i].
-                                        flags & IEEE80211_CHAN_NO_IBSS) ||
+                                        flags & IEEE80211_CHAN_NO_IR) ||
                                       (channels[i].
                                        flags & IEEE80211_CHAN_RADAR)) ? "" :
                                      ", IBSS",
                                      channels[i].
-                                      flags & IEEE80211_CHAN_PASSIVE_SCAN ?
+                                      flags & IEEE80211_CHAN_NO_IR ?
                                      "passive only" : "active/passive");
        }
        supp_band = il_get_hw_mode(il, IEEE80211_BAND_5GHZ);
@@ -594,12 +594,12 @@ il_dbgfs_channels_read(struct file *file, char __user *user_buf, size_t count,
                                      flags & IEEE80211_CHAN_RADAR ?
                                      " (IEEE 802.11h required)" : "",
                                      ((channels[i].
-                                        flags & IEEE80211_CHAN_NO_IBSS) ||
+                                        flags & IEEE80211_CHAN_NO_IR) ||
                                       (channels[i].
                                        flags & IEEE80211_CHAN_RADAR)) ? "" :
                                      ", IBSS",
                                      channels[i].
-                                      flags & IEEE80211_CHAN_PASSIVE_SCAN ?
+                                      flags & IEEE80211_CHAN_NO_IR ?
                                      "passive only" : "active/passive");
        }
        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
author	John W. Linville <linville@tuxdriver.com>	2013-12-02 14:25:38 -0500
committer	John W. Linville <linville@tuxdriver.com>	2013-12-02 14:25:38 -0500
commit	4b074b07625f603d40d4d04937f8874a00415dc4 (patch)
tree	2dffdc46e3fea0320524f483cf5ac2c058ab59f2 /drivers/net/wireless/iwlegacy
parent	7d68849f40cd9169088249cc889d95c8998c3fb8 (diff)
parent	ddcc347b70f298f9d624cd0e250581d831d915fb (diff)

diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c index dea3b50d68b9..5c3bcedd679b 100644 --- a/drivers/net/wireless/iwlegacy/3945-mac.c +++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -1595,7 +1595,7 @@ il3945_get_channels_for_scan(struct il_priv *il, enum ieee80211_band band,
1595	* and use long active_dwell time.	1595	* and use long active_dwell time.
1596	*/	1596	*/
1597	if (!is_active \|\| il_is_channel_passive(ch_info) \|\|	1597	if (!is_active \|\| il_is_channel_passive(ch_info) \|\|
1598	(chan->flags & IEEE80211_CHAN_PASSIVE_SCAN)) {	1598	(chan->flags & IEEE80211_CHAN_NO_IR)) {
1599	scan_ch->type = 0; /* passive */	1599	scan_ch->type = 0; /* passive */
1600	if (IL_UCODE_API(il->ucode_ver) == 1)	1600	if (IL_UCODE_API(il->ucode_ver) == 1)
1601	scan_ch->active_dwell =	1601	scan_ch->active_dwell =
@@ -3575,9 +3575,9 @@ il3945_setup_mac(struct il_priv *il)
3575	hw->wiphy->interface_modes =	3575	hw->wiphy->interface_modes =
3576	BIT(NL80211_IFTYPE_STATION) \| BIT(NL80211_IFTYPE_ADHOC);	3576	BIT(NL80211_IFTYPE_STATION) \| BIT(NL80211_IFTYPE_ADHOC);
3577		3577
3578	hw->wiphy->flags \|=	3578	hw->wiphy->flags \|= WIPHY_FLAG_IBSS_RSN;
3579	WIPHY_FLAG_CUSTOM_REGULATORY \| WIPHY_FLAG_DISABLE_BEACON_HINTS \|	3579	hw->wiphy->regulatory_flags \|= REGULATORY_CUSTOM_REG \|
3580	WIPHY_FLAG_IBSS_RSN;	3580	REGULATORY_DISABLE_BEACON_HINTS;
3581		3581
3582	hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;	3582	hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
3583		3583


diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index 3982ab76f375..43f488a8cda2 100644 --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -805,7 +805,7 @@ il4965_get_channels_for_scan(struct il_priv il, struct ieee80211_vif vif,
805	}	805	}
806		806
807	if (!is_active \|\| il_is_channel_passive(ch_info) \|\|	807	if (!is_active \|\| il_is_channel_passive(ch_info) \|\|
808	(chan->flags & IEEE80211_CHAN_PASSIVE_SCAN))	808	(chan->flags & IEEE80211_CHAN_NO_IR))
809	scan_ch->type = SCAN_CHANNEL_TYPE_PASSIVE;	809	scan_ch->type = SCAN_CHANNEL_TYPE_PASSIVE;
810	else	810	else
811	scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE;	811	scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE;
@@ -5778,9 +5778,9 @@ il4965_mac_setup_register(struct il_priv *il, u32 max_probe_length)
5778	hw->wiphy->interface_modes =	5778	hw->wiphy->interface_modes =
5779	BIT(NL80211_IFTYPE_STATION) \| BIT(NL80211_IFTYPE_ADHOC);	5779	BIT(NL80211_IFTYPE_STATION) \| BIT(NL80211_IFTYPE_ADHOC);
5780		5780
5781	hw->wiphy->flags \|=	5781	hw->wiphy->flags \|= WIPHY_FLAG_IBSS_RSN;
5782	WIPHY_FLAG_CUSTOM_REGULATORY \| WIPHY_FLAG_DISABLE_BEACON_HINTS \|	5782	hw->wiphy->regulatory_flags \|= REGULATORY_CUSTOM_REG \|
5783	WIPHY_FLAG_IBSS_RSN;	5783	REGULATORY_DISABLE_BEACON_HINTS;
5784		5784
5785	/*	5785	/*
5786	* For now, disable PS by default because it affects	5786	* For now, disable PS by default because it affects


diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c index b03e22ef5462..a27b14cfeaec 100644 --- a/drivers/net/wireless/iwlegacy/common.c +++ b/drivers/net/wireless/iwlegacy/common.c
@@ -3445,10 +3445,10 @@ il_init_geos(struct il_priv *il)
3445		3445
3446	if (il_is_channel_valid(ch)) {	3446	if (il_is_channel_valid(ch)) {
3447	if (!(ch->flags & EEPROM_CHANNEL_IBSS))	3447	if (!(ch->flags & EEPROM_CHANNEL_IBSS))
3448	geo_ch->flags \|= IEEE80211_CHAN_NO_IBSS;	3448	geo_ch->flags \|= IEEE80211_CHAN_NO_IR;
3449		3449
3450	if (!(ch->flags & EEPROM_CHANNEL_ACTIVE))	3450	if (!(ch->flags & EEPROM_CHANNEL_ACTIVE))
3451	geo_ch->flags \|= IEEE80211_CHAN_PASSIVE_SCAN;	3451	geo_ch->flags \|= IEEE80211_CHAN_NO_IR;
3452		3452
3453	if (ch->flags & EEPROM_CHANNEL_RADAR)	3453	if (ch->flags & EEPROM_CHANNEL_RADAR)
3454	geo_ch->flags \|= IEEE80211_CHAN_RADAR;	3454	geo_ch->flags \|= IEEE80211_CHAN_RADAR;


diff --git a/drivers/net/wireless/iwlegacy/debug.c b/drivers/net/wireless/iwlegacy/debug.c index eff26501d60a..3a487a3bb5de 100644 --- a/drivers/net/wireless/iwlegacy/debug.c +++ b/drivers/net/wireless/iwlegacy/debug.c
@@ -567,12 +567,12 @@ il_dbgfs_channels_read(struct file file, char __user user_buf, size_t count,
567	flags & IEEE80211_CHAN_RADAR ?	567	flags & IEEE80211_CHAN_RADAR ?
568	" (IEEE 802.11h required)" : "",	568	" (IEEE 802.11h required)" : "",
569	((channels[i].	569	((channels[i].
570	flags & IEEE80211_CHAN_NO_IBSS) \|\|	570	flags & IEEE80211_CHAN_NO_IR) \|\|
571	(channels[i].	571	(channels[i].
572	flags & IEEE80211_CHAN_RADAR)) ? "" :	572	flags & IEEE80211_CHAN_RADAR)) ? "" :
573	", IBSS",	573	", IBSS",
574	channels[i].	574	channels[i].
575	flags & IEEE80211_CHAN_PASSIVE_SCAN ?	575	flags & IEEE80211_CHAN_NO_IR ?
576	"passive only" : "active/passive");	576	"passive only" : "active/passive");
577	}	577	}
578	supp_band = il_get_hw_mode(il, IEEE80211_BAND_5GHZ);	578	supp_band = il_get_hw_mode(il, IEEE80211_BAND_5GHZ);
@@ -594,12 +594,12 @@ il_dbgfs_channels_read(struct file file, char __user user_buf, size_t count,
594	flags & IEEE80211_CHAN_RADAR ?	594	flags & IEEE80211_CHAN_RADAR ?
595	" (IEEE 802.11h required)" : "",	595	" (IEEE 802.11h required)" : "",
596	((channels[i].	596	((channels[i].
597	flags & IEEE80211_CHAN_NO_IBSS) \|\|	597	flags & IEEE80211_CHAN_NO_IR) \|\|
598	(channels[i].	598	(channels[i].
599	flags & IEEE80211_CHAN_RADAR)) ? "" :	599	flags & IEEE80211_CHAN_RADAR)) ? "" :
600	", IBSS",	600	", IBSS",
601	channels[i].	601	channels[i].
602	flags & IEEE80211_CHAN_PASSIVE_SCAN ?	602	flags & IEEE80211_CHAN_NO_IR ?
603	"passive only" : "active/passive");	603	"passive only" : "active/passive");
604	}	604	}
605	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);	605	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);