diff options
| author | Arik Nemtsov <arik@wizery.com> | 2012-06-13 18:09:25 +0200 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2012-06-21 15:48:20 +0200 |
| commit | fa2adfcdbd88124e8b7cc46c6363b1343dabc09d (patch) | |
| tree | 7a821003a5b3178ca39db9989f2b9c20fc3002de /drivers/net/wireless/ti/wl12xx/main.c | |
| parent | wl18xx: explicitly remove the 5Ghz MIMO HT cap (diff) | |
| download | linux-fa2adfcdbd88124e8b7cc46c6363b1343dabc09d.tar.xz linux-fa2adfcdbd88124e8b7cc46c6363b1343dabc09d.zip | |
wl18xx: sane defaults for HT capabilities
Introduce a default set of HT capabilities that are set according to the
number of antennas on the board. Move the HT setting code down to allow
the number of antennas to be set (and optionally overridden) before it.
Remove the "mimo" HT option, since the default mode now enables MIMO is
possible.
Use this opportunity to add a helper function for setting HT
capabilities and reduce the volume of the code a bit.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/ti/wl12xx/main.c')
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c index 7974ed55dd5b..0d2fdca2aa32 100644 --- a/drivers/net/wireless/ti/wl12xx/main.c +++ b/drivers/net/wireless/ti/wl12xx/main.c @@ -1449,10 +1449,8 @@ static int __devinit wl12xx_probe(struct platform_device *pdev) wl->hw_min_ht_rate = WL12XX_CONF_HW_RXTX_RATE_MCS0; wl->fw_status_priv_len = 0; wl->stats.fw_stats_len = sizeof(struct wl12xx_acx_statistics); - memcpy(&wl->ht_cap[IEEE80211_BAND_2GHZ], &wl12xx_ht_cap, - sizeof(wl12xx_ht_cap)); - memcpy(&wl->ht_cap[IEEE80211_BAND_5GHZ], &wl12xx_ht_cap, - sizeof(wl12xx_ht_cap)); + wlcore_set_ht_cap(wl, IEEE80211_BAND_2GHZ, &wl12xx_ht_cap); + wlcore_set_ht_cap(wl, IEEE80211_BAND_5GHZ, &wl12xx_ht_cap); wl12xx_conf_init(wl); if (!fref_param) { |