aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ti/wl18xx/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ti/wl18xx/main.c')
-rw-r--r--drivers/net/wireless/ti/wl18xx/main.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index 1bf26cc7374e..ae47c79cb9b6 100644
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -137,8 +137,8 @@ static const u8 wl18xx_rate_to_idx_5ghz[] = {
137}; 137};
138 138
139static const u8 *wl18xx_band_rate_to_idx[] = { 139static const u8 *wl18xx_band_rate_to_idx[] = {
140 [IEEE80211_BAND_2GHZ] = wl18xx_rate_to_idx_2ghz, 140 [NL80211_BAND_2GHZ] = wl18xx_rate_to_idx_2ghz,
141 [IEEE80211_BAND_5GHZ] = wl18xx_rate_to_idx_5ghz 141 [NL80211_BAND_5GHZ] = wl18xx_rate_to_idx_5ghz
142}; 142};
143 143
144enum wl18xx_hw_rates { 144enum wl18xx_hw_rates {
@@ -1302,12 +1302,12 @@ static u32 wl18xx_ap_get_mimo_wide_rate_mask(struct wl1271 *wl,
1302 wl1271_debug(DEBUG_ACX, "using wide channel rate mask"); 1302 wl1271_debug(DEBUG_ACX, "using wide channel rate mask");
1303 1303
1304 /* sanity check - we don't support this */ 1304 /* sanity check - we don't support this */
1305 if (WARN_ON(wlvif->band != IEEE80211_BAND_5GHZ)) 1305 if (WARN_ON(wlvif->band != NL80211_BAND_5GHZ))
1306 return 0; 1306 return 0;
1307 1307
1308 return CONF_TX_RATE_USE_WIDE_CHAN; 1308 return CONF_TX_RATE_USE_WIDE_CHAN;
1309 } else if (wl18xx_is_mimo_supported(wl) && 1309 } else if (wl18xx_is_mimo_supported(wl) &&
1310 wlvif->band == IEEE80211_BAND_2GHZ) { 1310 wlvif->band == NL80211_BAND_2GHZ) {
1311 wl1271_debug(DEBUG_ACX, "using MIMO rate mask"); 1311 wl1271_debug(DEBUG_ACX, "using MIMO rate mask");
1312 /* 1312 /*
1313 * we don't care about HT channel here - if a peer doesn't 1313 * we don't care about HT channel here - if a peer doesn't
@@ -1996,24 +1996,24 @@ static int wl18xx_setup(struct wl1271 *wl)
1996 * siso40. 1996 * siso40.
1997 */ 1997 */
1998 if (wl18xx_is_mimo_supported(wl)) 1998 if (wl18xx_is_mimo_supported(wl))
1999 wlcore_set_ht_cap(wl, IEEE80211_BAND_2GHZ, 1999 wlcore_set_ht_cap(wl, NL80211_BAND_2GHZ,
2000 &wl18xx_mimo_ht_cap_2ghz); 2000 &wl18xx_mimo_ht_cap_2ghz);
2001 else 2001 else
2002 wlcore_set_ht_cap(wl, IEEE80211_BAND_2GHZ, 2002 wlcore_set_ht_cap(wl, NL80211_BAND_2GHZ,
2003 &wl18xx_siso40_ht_cap_2ghz); 2003 &wl18xx_siso40_ht_cap_2ghz);
2004 2004
2005 /* 5Ghz is always wide */ 2005 /* 5Ghz is always wide */
2006 wlcore_set_ht_cap(wl, IEEE80211_BAND_5GHZ, 2006 wlcore_set_ht_cap(wl, NL80211_BAND_5GHZ,
2007 &wl18xx_siso40_ht_cap_5ghz); 2007 &wl18xx_siso40_ht_cap_5ghz);
2008 } else if (priv->conf.ht.mode == HT_MODE_WIDE) { 2008 } else if (priv->conf.ht.mode == HT_MODE_WIDE) {
2009 wlcore_set_ht_cap(wl, IEEE80211_BAND_2GHZ, 2009 wlcore_set_ht_cap(wl, NL80211_BAND_2GHZ,
2010 &wl18xx_siso40_ht_cap_2ghz); 2010 &wl18xx_siso40_ht_cap_2ghz);
2011 wlcore_set_ht_cap(wl, IEEE80211_BAND_5GHZ, 2011 wlcore_set_ht_cap(wl, NL80211_BAND_5GHZ,
2012 &wl18xx_siso40_ht_cap_5ghz); 2012 &wl18xx_siso40_ht_cap_5ghz);
2013 } else if (priv->conf.ht.mode == HT_MODE_SISO20) { 2013 } else if (priv->conf.ht.mode == HT_MODE_SISO20) {
2014 wlcore_set_ht_cap(wl, IEEE80211_BAND_2GHZ, 2014 wlcore_set_ht_cap(wl, NL80211_BAND_2GHZ,
2015 &wl18xx_siso20_ht_cap); 2015 &wl18xx_siso20_ht_cap);
2016 wlcore_set_ht_cap(wl, IEEE80211_BAND_5GHZ, 2016 wlcore_set_ht_cap(wl, NL80211_BAND_5GHZ,
2017 &wl18xx_siso20_ht_cap); 2017 &wl18xx_siso20_ht_cap);
2018 } 2018 }
2019 2019