Greetings!
I think that other references to "fat" should be removed as well, in
favor of "HT40".
On Fri, Apr 3, 2009 at 12:26 AM, Luis R. Rodriguez
<lrodriguez@xxxxxxxxxxx> wrote:
> This is more consistent with our nl80211 naming convention
> for HT40-/+.
>
> Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
> ---
> drivers/net/wireless/iwlwifi/iwl-core.c | 4 ++--
> drivers/net/wireless/iwlwifi/iwl-eeprom.c | 8 ++++----
> include/net/wireless.h | 12 ++++++------
> net/mac80211/mlme.c | 4 ++--
> net/wireless/reg.c | 16 ++++++++--------
> 5 files changed, 22 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
> index c54fb93..d558797 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-core.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-core.c
> @@ -591,10 +591,10 @@ static u8 iwl_is_channel_extension(struct iwl_priv *priv,
>
> if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_ABOVE)
> return !(ch_info->fat_extension_channel &
This should be ch_info->ht40_channel or ht40_ext_channel IMO.
> - IEEE80211_CHAN_NO_FAT_ABOVE);
> + IEEE80211_CHAN_NO_HT40PLUS);
> else if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_BELOW)
> return !(ch_info->fat_extension_channel &
Same here.
> - IEEE80211_CHAN_NO_FAT_BELOW);
> + IEEE80211_CHAN_NO_HT40MINUS);
>
> return 0;
> }
> diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
> index 75517d0..9d73f19 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
> @@ -481,8 +481,8 @@ int iwl_init_channel_map(struct iwl_priv *priv)
> /* First write that fat is not enabled, and then enable
This is especially confusing - "First write that HT40 is disabled"
would be better.
> * one by one */
> ch_info->fat_extension_channel =
ch_info->ht40_channel =
> - (IEEE80211_CHAN_NO_FAT_ABOVE |
> - IEEE80211_CHAN_NO_FAT_BELOW);
> + (IEEE80211_CHAN_NO_HT40PLUS |
> + IEEE80211_CHAN_NO_HT40MINUS);
>
> if (!(is_channel_valid(ch_info))) {
> IWL_DEBUG_INFO(priv, "Ch. %d Flags %x [%sGHz] - "
> @@ -561,7 +561,7 @@ int iwl_init_channel_map(struct iwl_priv *priv)
> fat_extension_chan = 0;
Same here.
> else
> fat_extension_chan =
Same here.
> - IEEE80211_CHAN_NO_FAT_BELOW;
> + IEEE80211_CHAN_NO_HT40MINUS;
>
> /* Set up driver's info for lower half */
> iwl_set_fat_chan_info(priv, ieeeband,
iwl_set_ht40_info would sound a lot better.
> @@ -573,7 +573,7 @@ int iwl_init_channel_map(struct iwl_priv *priv)
> iwl_set_fat_chan_info(priv, ieeeband,
Same here.
> (eeprom_ch_index[ch] + 4),
> &(eeprom_ch_info[ch]),
> - IEEE80211_CHAN_NO_FAT_ABOVE);
> + IEEE80211_CHAN_NO_HT40PLUS);
> }
> }
>
> diff --git a/include/net/wireless.h b/include/net/wireless.h
> index e3077e1..0331d26 100644
> --- a/include/net/wireless.h
> +++ b/include/net/wireless.h
> @@ -40,21 +40,21 @@ enum ieee80211_band {
> * on this channel.
> * @IEEE80211_CHAN_NO_IBSS: IBSS is not allowed on this channel.
> * @IEEE80211_CHAN_RADAR: Radar detection is required on this channel.
> - * @IEEE80211_CHAN_NO_FAT_ABOVE: extension channel above this channel
> + * @IEEE80211_CHAN_NO_HT40PLUS: extension channel above this channel
> * is not permitted.
> - * @IEEE80211_CHAN_NO_FAT_BELOW: extension channel below this channel
> + * @IEEE80211_CHAN_NO_HT40MINUS: extension channel below this channel
> * is not permitted.
> * @IEEE80211_CHAN_NO_HT40: indicates no HT40 is allowed at all,
> - * when this is set %IEEE80211_CHAN_NO_FAT_ABOVE and
> - * %IEEE80211_CHAN_NO_FAT_BELOW will also be set.
> + * when this is set %IEEE80211_CHAN_NO_HT40PLUS and
> + * %IEEE80211_CHAN_NO_HT40MINUS will also be set.
> */
> enum ieee80211_channel_flags {
> IEEE80211_CHAN_DISABLED = 1<<0,
> IEEE80211_CHAN_PASSIVE_SCAN = 1<<1,
> IEEE80211_CHAN_NO_IBSS = 1<<2,
> IEEE80211_CHAN_RADAR = 1<<3,
> - IEEE80211_CHAN_NO_FAT_ABOVE = 1<<4,
> - IEEE80211_CHAN_NO_FAT_BELOW = 1<<5,
> + IEEE80211_CHAN_NO_HT40PLUS = 1<<4,
> + IEEE80211_CHAN_NO_HT40MINUS = 1<<5,
> IEEE80211_CHAN_NO_HT40 = 1<<6,
> };
>
> diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
> index 7ecda9d..3670014 100644
> --- a/net/mac80211/mlme.c
> +++ b/net/mac80211/mlme.c
> @@ -263,13 +263,13 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
>
> switch (ht_info->ht_param & IEEE80211_HT_PARAM_CHA_SEC_OFFSET) {
> case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
> - if (flags & IEEE80211_CHAN_NO_FAT_ABOVE) {
> + if (flags & IEEE80211_CHAN_NO_HT40PLUS) {
> cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
> cap &= ~IEEE80211_HT_CAP_SGI_40;
> }
> break;
> case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
> - if (flags & IEEE80211_CHAN_NO_FAT_BELOW) {
> + if (flags & IEEE80211_CHAN_NO_HT40MINUS) {
> cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
> cap &= ~IEEE80211_HT_CAP_SGI_40;
> }
> diff --git a/net/wireless/reg.c b/net/wireless/reg.c
> index 91f7b34..6f25ef4 100644
> --- a/net/wireless/reg.c
> +++ b/net/wireless/reg.c
> @@ -1185,8 +1185,8 @@ static void reg_process_ht_flags_channel(struct wiphy *wiphy,
>
> if (channel->flags &
> (IEEE80211_CHAN_DISABLED | IEEE80211_CHAN_NO_HT40)) {
> - channel->flags |= IEEE80211_CHAN_NO_FAT_ABOVE |
> - IEEE80211_CHAN_NO_FAT_BELOW;
> + channel->flags |= IEEE80211_CHAN_NO_HT40PLUS |
> + IEEE80211_CHAN_NO_HT40MINUS;
> return;
> }
>
> @@ -1209,15 +1209,15 @@ static void reg_process_ht_flags_channel(struct wiphy *wiphy,
> */
> if (!channel_before || (channel_before->flags &
> (IEEE80211_CHAN_DISABLED | IEEE80211_CHAN_NO_HT40)))
> - channel->flags |= IEEE80211_CHAN_NO_FAT_BELOW;
> + channel->flags |= IEEE80211_CHAN_NO_HT40MINUS;
> else
> - channel->flags &= ~IEEE80211_CHAN_NO_FAT_BELOW;
> + channel->flags &= ~IEEE80211_CHAN_NO_HT40MINUS;
>
> if (!channel_after || (channel_after->flags &
> (IEEE80211_CHAN_DISABLED | IEEE80211_CHAN_NO_HT40)))
> - channel->flags |= IEEE80211_CHAN_NO_FAT_ABOVE;
> + channel->flags |= IEEE80211_CHAN_NO_HT40PLUS;
> else
> - channel->flags &= ~IEEE80211_CHAN_NO_FAT_ABOVE;
> + channel->flags &= ~IEEE80211_CHAN_NO_HT40PLUS;
> }
>
> static void reg_process_ht_flags_band(struct wiphy *wiphy,
> @@ -1299,8 +1299,8 @@ static void handle_channel_custom(struct wiphy *wiphy,
>
> if (freq_range->max_bandwidth_khz < MHZ_TO_KHZ(40))
> bw_flags = IEEE80211_CHAN_NO_HT40 |
> - IEEE80211_CHAN_NO_FAT_BELOW |
> - IEEE80211_CHAN_NO_FAT_ABOVE;
> + IEEE80211_CHAN_NO_HT40MINUS |
> + IEEE80211_CHAN_NO_HT40PLUS;
>
> chan->flags |= map_regdom_flags(reg_rule->flags) | bw_flags;
> chan->max_antenna_gain = (int) MBI_TO_DBI(power_rule->max_antenna_gain);
> --
> 1.6.0.6
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
I'll possibly submit a patch for this tomorrow (though I haven't
booted my Linux install for like a month, and it is still @
2.6.28-wl).
--
Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
