Skip to content

Commit

Permalink
mwifiex: correct bitrates advertised to cfg80211
Browse files Browse the repository at this point in the history
1. Driver and firmware do not support 22Mbps and 72Mbps bitrates.
Remove them from the rate table advertised to cfg80211.

2. First 4 rates from mwifiex_rates table are not valid for
5GHz/A band. Set correct bitrate array's index and no of rates for
ieee80211_supported_band for 5GHz band.

Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: Nishant Sarmukadam <nishants@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: Kiran Divekar <dkiran@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Avinash Patil authored and John W. Linville committed Mar 5, 2012
1 parent f384b3d commit eb416ad
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/net/wireless/mwifiex/cfg80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,6 @@ static struct ieee80211_rate mwifiex_rates[] = {
{.bitrate = 20, .hw_value = 4, },
{.bitrate = 55, .hw_value = 11, },
{.bitrate = 110, .hw_value = 22, },
{.bitrate = 220, .hw_value = 44, },
{.bitrate = 60, .hw_value = 12, },
{.bitrate = 90, .hw_value = 18, },
{.bitrate = 120, .hw_value = 24, },
Expand All @@ -622,7 +621,6 @@ static struct ieee80211_rate mwifiex_rates[] = {
{.bitrate = 360, .hw_value = 72, },
{.bitrate = 480, .hw_value = 96, },
{.bitrate = 540, .hw_value = 108, },
{.bitrate = 720, .hw_value = 144, },
};

/* Channel definitions to be advertised to cfg80211 */
Expand Down Expand Up @@ -688,8 +686,8 @@ static struct ieee80211_channel mwifiex_channels_5ghz[] = {
static struct ieee80211_supported_band mwifiex_band_5ghz = {
.channels = mwifiex_channels_5ghz,
.n_channels = ARRAY_SIZE(mwifiex_channels_5ghz),
.bitrates = mwifiex_rates - 4,
.n_bitrates = ARRAY_SIZE(mwifiex_rates) + 4,
.bitrates = mwifiex_rates + 4,
.n_bitrates = ARRAY_SIZE(mwifiex_rates) - 4,
};


Expand Down

0 comments on commit eb416ad

Please sign in to comment.