aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex
diff options
context:
space:
mode:
authorAvinash Patil <patila@marvell.com>2012-02-28 01:04:11 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-03-05 15:20:52 -0500
commiteb416ad37db897efe9b2a5b79bd671f5966fa443 (patch)
tree6a6d4d0c3d62c89d3fd590059eee04ba631c6c25 /drivers/net/wireless/mwifiex
parentf384b3dddc727b1cbd77e493c24d7fefa883396a (diff)
mwifiex: correct bitrates advertised to cfg80211
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>
Diffstat (limited to 'drivers/net/wireless/mwifiex')
-rw-r--r--drivers/net/wireless/mwifiex/cfg80211.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 6a81101bab44..55293a3ac317 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -613,7 +613,6 @@ static struct ieee80211_rate mwifiex_rates[] = {
613 {.bitrate = 20, .hw_value = 4, }, 613 {.bitrate = 20, .hw_value = 4, },
614 {.bitrate = 55, .hw_value = 11, }, 614 {.bitrate = 55, .hw_value = 11, },
615 {.bitrate = 110, .hw_value = 22, }, 615 {.bitrate = 110, .hw_value = 22, },
616 {.bitrate = 220, .hw_value = 44, },
617 {.bitrate = 60, .hw_value = 12, }, 616 {.bitrate = 60, .hw_value = 12, },
618 {.bitrate = 90, .hw_value = 18, }, 617 {.bitrate = 90, .hw_value = 18, },
619 {.bitrate = 120, .hw_value = 24, }, 618 {.bitrate = 120, .hw_value = 24, },
@@ -622,7 +621,6 @@ static struct ieee80211_rate mwifiex_rates[] = {
622 {.bitrate = 360, .hw_value = 72, }, 621 {.bitrate = 360, .hw_value = 72, },
623 {.bitrate = 480, .hw_value = 96, }, 622 {.bitrate = 480, .hw_value = 96, },
624 {.bitrate = 540, .hw_value = 108, }, 623 {.bitrate = 540, .hw_value = 108, },
625 {.bitrate = 720, .hw_value = 144, },
626}; 624};
627 625
628/* Channel definitions to be advertised to cfg80211 */ 626/* Channel definitions to be advertised to cfg80211 */
@@ -688,8 +686,8 @@ static struct ieee80211_channel mwifiex_channels_5ghz[] = {
688static struct ieee80211_supported_band mwifiex_band_5ghz = { 686static struct ieee80211_supported_band mwifiex_band_5ghz = {
689 .channels = mwifiex_channels_5ghz, 687 .channels = mwifiex_channels_5ghz,
690 .n_channels = ARRAY_SIZE(mwifiex_channels_5ghz), 688 .n_channels = ARRAY_SIZE(mwifiex_channels_5ghz),
691 .bitrates = mwifiex_rates - 4, 689 .bitrates = mwifiex_rates + 4,
692 .n_bitrates = ARRAY_SIZE(mwifiex_rates) + 4, 690 .n_bitrates = ARRAY_SIZE(mwifiex_rates) - 4,
693}; 691};
694 692
695 693