iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mwifiex: fix issues in band configuration code

Browse Source 
Currently due to following issues in the code even if device is
configured in B only, G only or BG mode using iw bitrates command,
ibss is getting created in BGN mode.

1) mwifiex_channels_to_cfg80211_channel_type() routine gives channel
type as NL80211_CHAN_HT20 for non-HT channel as well, because driver
doesn't store HT information provided by stack for the channel.
This issue is fixed by maintaining channel type information in
'adapter->channel_type'.
2) Band configuration is unnecessarily overwritten with BGN/AN while
setting channel.

This patch makes sure that "adapter->config_bands" correctly gets
modified while setting channel.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Amitkumar Karwar 2011-12-20 23:47:22 -08:00 committed by John W. Linville
parent 21c3ba3464
commit 3aebee028a
2 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
drivers/net/wireless/mwifiex/cfg80211.c
View File

@ -47,30 +47,6 @@ mwifiex_cfg80211_channel_type_to_sec_chan_offset(enum nl80211_channel_type
} }
} }
/*
* This function maps the driver channel type into nl802.11 channel type.
*
* The mapping is as follows -
* IEEE80211_HT_PARAM_CHA_SEC_NONE -> NL80211_CHAN_HT20
* IEEE80211_HT_PARAM_CHA_SEC_ABOVE -> NL80211_CHAN_HT40PLUS
* IEEE80211_HT_PARAM_CHA_SEC_BELOW -> NL80211_CHAN_HT40MINUS
* Others -> NL80211_CHAN_HT20
*/
static enum nl80211_channel_type
mwifiex_channels_to_cfg80211_channel_type(int channel_type)
{
switch (channel_type) {
case IEEE80211_HT_PARAM_CHA_SEC_NONE:
return NL80211_CHAN_HT20;
case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
return NL80211_CHAN_HT40PLUS;
case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
return NL80211_CHAN_HT40MINUS;
default:
return NL80211_CHAN_HT20;
}
}
/* /*
* This function checks whether WEP is set. * This function checks whether WEP is set.
*/ */
@ -337,10 +313,22 @@ mwifiex_set_rf_channel(struct mwifiex_private *priv,
if (chan) { if (chan) {
/* Set appropriate bands */ /* Set appropriate bands */
if (chan->band == IEEE80211_BAND_2GHZ) if (chan->band == IEEE80211_BAND_2GHZ) {
config_bands = BAND_B | BAND_G | BAND_GN; if (channel_type == NL80211_CHAN_NO_HT)
else if (priv->adapter->config_bands == BAND_B ||
config_bands = BAND_AN | BAND_A; priv->adapter->config_bands == BAND_G)
config_bands =
priv->adapter->config_bands;
else
config_bands = BAND_B | BAND_G;
else
config_bands = BAND_B | BAND_G | BAND_GN;
} else {
if (channel_type == NL80211_CHAN_NO_HT)
config_bands = BAND_A;
else
config_bands = BAND_AN | BAND_A;
}
if (!((config_bands | adapter->fw_bands) & if (!((config_bands | adapter->fw_bands) &
~adapter->fw_bands)) { ~adapter->fw_bands)) {
@ -357,6 +345,7 @@ mwifiex_set_rf_channel(struct mwifiex_private *priv,
adapter->sec_chan_offset = adapter->sec_chan_offset =
mwifiex_cfg80211_channel_type_to_sec_chan_offset mwifiex_cfg80211_channel_type_to_sec_chan_offset
(channel_type); (channel_type);
adapter->channel_type = channel_type;
mwifiex_send_domain_info_cmd_fw(wiphy); mwifiex_send_domain_info_cmd_fw(wiphy);
} }
@ -730,6 +719,7 @@ static int mwifiex_cfg80211_set_bitrate_mask(struct wiphy *wiphy,
} }
} }
adapter->sec_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_NONE; adapter->sec_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_NONE;
adapter->channel_type = NL80211_CHAN_NO_HT;
wiphy_debug(wiphy, "info: device configured in 802.11%s%s mode\n", wiphy_debug(wiphy, "info: device configured in 802.11%s%s mode\n",
(mode & BAND_B) ? "b" : "", (mode & BAND_B) ? "b" : "",
@ -849,8 +839,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
if (channel) if (channel)
ret = mwifiex_set_rf_channel(priv, channel, ret = mwifiex_set_rf_channel(priv, channel,
mwifiex_channels_to_cfg80211_channel_type priv->adapter->channel_type);
(priv->adapter->sec_chan_offset));
ret = mwifiex_set_encode(priv, NULL, 0, 0, 1); /* Disable keys */ ret = mwifiex_set_encode(priv, NULL, 0, 0, 1); /* Disable keys */

1
drivers/net/wireless/mwifiex/main.h
View File

@ -641,6 +641,7 @@ struct mwifiex_adapter {
u8 hw_dev_mcs_support; u8 hw_dev_mcs_support;
u8 adhoc_11n_enabled; u8 adhoc_11n_enabled;
u8 sec_chan_offset; u8 sec_chan_offset;
enum nl80211_channel_type channel_type;
struct mwifiex_dbg dbg; struct mwifiex_dbg dbg;
u8 arp_filter[ARP_FILTER_MAX_BUF_SIZE]; u8 arp_filter[ARP_FILTER_MAX_BUF_SIZE];
u32 arp_filter_size; u32 arp_filter_size;