diff options
| author | Juuso Oikarinen <juuso.oikarinen@nokia.com> | 2010-02-22 01:38:32 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-03-09 15:03:02 -0500 |
| commit | 15305498a443c181c8fb5deafb94eae585fe3ad5 (patch) | |
| tree | 8c3c46ef7a239005c47376700e3f8c01536394b4 /drivers/net/wireless/wl12xx/wl1271_cmd.c | |
| parent | ffb591cd0e32d817bdbd359dead3baa770b999f8 (diff) | |
wl1271: Fix ad-hoc mode neighborhood detection
This patch fixes a bug in ad-hoc mode preventing mac80211 from properly
detecting other ad-hoc networks with the same SSID.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Kalle Valo <kalle.valo@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_cmd.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_cmd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_cmd.c b/drivers/net/wireless/wl12xx/wl1271_cmd.c index 6759aa11c132..e029bf03809d 100644 --- a/drivers/net/wireless/wl12xx/wl1271_cmd.c +++ b/drivers/net/wireless/wl12xx/wl1271_cmd.c | |||
| @@ -247,7 +247,7 @@ int wl1271_cmd_radio_parms(struct wl1271 *wl) | |||
| 247 | return ret; | 247 | return ret; |
| 248 | } | 248 | } |
| 249 | 249 | ||
| 250 | int wl1271_cmd_join(struct wl1271 *wl) | 250 | int wl1271_cmd_join(struct wl1271 *wl, u8 bss_type) |
| 251 | { | 251 | { |
| 252 | static bool do_cal = true; | 252 | static bool do_cal = true; |
| 253 | struct wl1271_cmd_join *join; | 253 | struct wl1271_cmd_join *join; |
| @@ -278,7 +278,7 @@ int wl1271_cmd_join(struct wl1271 *wl) | |||
| 278 | 278 | ||
| 279 | join->rx_config_options = cpu_to_le32(wl->rx_config); | 279 | join->rx_config_options = cpu_to_le32(wl->rx_config); |
| 280 | join->rx_filter_options = cpu_to_le32(wl->rx_filter); | 280 | join->rx_filter_options = cpu_to_le32(wl->rx_filter); |
| 281 | join->bss_type = wl->bss_type; | 281 | join->bss_type = bss_type; |
| 282 | 282 | ||
| 283 | /* | 283 | /* |
| 284 | * FIXME: disable temporarily all filters because after commit | 284 | * FIXME: disable temporarily all filters because after commit |