diff options
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_cmd.c')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_cmd.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_cmd.c b/drivers/net/wireless/wl12xx/wl1271_cmd.c index 6d7a40c004f..fe4f1e64512 100644 --- a/drivers/net/wireless/wl12xx/wl1271_cmd.c +++ b/drivers/net/wireless/wl12xx/wl1271_cmd.c | |||
@@ -219,6 +219,7 @@ int wl1271_cmd_join(struct wl1271 *wl) | |||
219 | 219 | ||
220 | join->rx_config_options = wl->rx_config; | 220 | join->rx_config_options = wl->rx_config; |
221 | join->rx_filter_options = wl->rx_filter; | 221 | join->rx_filter_options = wl->rx_filter; |
222 | join->bss_type = wl->bss_type; | ||
222 | 223 | ||
223 | /* | 224 | /* |
224 | * FIXME: disable temporarily all filters because after commit | 225 | * FIXME: disable temporarily all filters because after commit |
@@ -229,12 +230,20 @@ int wl1271_cmd_join(struct wl1271 *wl) | |||
229 | join->rx_config_options = 0; | 230 | join->rx_config_options = 0; |
230 | join->rx_filter_options = WL1271_DEFAULT_RX_FILTER; | 231 | join->rx_filter_options = WL1271_DEFAULT_RX_FILTER; |
231 | 232 | ||
232 | join->basic_rate_set = CONF_HW_BIT_RATE_1MBPS | CONF_HW_BIT_RATE_2MBPS | | 233 | if (wl->band == IEEE80211_BAND_2GHZ) |
234 | join->basic_rate_set = | ||
235 | CONF_HW_BIT_RATE_1MBPS | CONF_HW_BIT_RATE_2MBPS | | ||
233 | CONF_HW_BIT_RATE_5_5MBPS | CONF_HW_BIT_RATE_11MBPS; | 236 | CONF_HW_BIT_RATE_5_5MBPS | CONF_HW_BIT_RATE_11MBPS; |
237 | else { | ||
238 | join->bss_type |= WL1271_JOIN_CMD_BSS_TYPE_5GHZ; | ||
239 | join->basic_rate_set = | ||
240 | CONF_HW_BIT_RATE_6MBPS | CONF_HW_BIT_RATE_12MBPS | | ||
241 | CONF_HW_BIT_RATE_24MBPS; | ||
242 | } | ||
234 | 243 | ||
235 | join->beacon_interval = WL1271_DEFAULT_BEACON_INT; | 244 | join->beacon_interval = WL1271_DEFAULT_BEACON_INT; |
236 | join->dtim_interval = WL1271_DEFAULT_DTIM_PERIOD; | 245 | join->dtim_interval = WL1271_DEFAULT_DTIM_PERIOD; |
237 | join->bss_type = wl->bss_type; | 246 | |
238 | join->channel = wl->channel; | 247 | join->channel = wl->channel; |
239 | join->ssid_len = wl->ssid_len; | 248 | join->ssid_len = wl->ssid_len; |
240 | memcpy(join->ssid, wl->ssid, wl->ssid_len); | 249 | memcpy(join->ssid, wl->ssid, wl->ssid_len); |