diff options
| author | Juuso Oikarinen <juuso.oikarinen@nokia.com> | 2010-02-18 13:25:38 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-02-19 15:52:42 -0500 |
| commit | 30240fc76a57e37a4bb42976ff7162b5e45e6117 (patch) | |
| tree | 254d0e78384b0eea234bb5c114692c562551d271 /drivers/net/wireless/wl12xx/wl1271_event.c | |
| parent | ddb01a5b368270f3cc86b606ba6f7ee8795a8a99 (diff) | |
wl1271: Add SSID configuration for JOIN in ad-hoc
This patch adds code to extract the SSID from the beacon template used for
ad-hoc. The mac80211 currently does not provide the SSID, so this is a
workaround for that, for now.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_event.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_event.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_event.c b/drivers/net/wireless/wl12xx/wl1271_event.c index cecbae2ded3..2803e700a75 100644 --- a/drivers/net/wireless/wl12xx/wl1271_event.c +++ b/drivers/net/wireless/wl12xx/wl1271_event.c @@ -92,7 +92,12 @@ static int wl1271_event_ps_report(struct wl1271 *wl, true); } else { wl1271_error("PSM entry failed, giving up.\n"); - /* make sure the firmware goes into active mode */ + /* FIXME: this may need to be reconsidered. for now it + is not possible to indicate to the mac80211 + afterwards that PSM entry failed. To maximize + functionality (receiving data and remaining + associated) make sure that we are in sync with the + AP in regard of PSM mode. */ ret = wl1271_ps_set_mode(wl, STATION_ACTIVE_MODE, false); wl->psm_entry_retry = 0; @@ -124,7 +129,8 @@ static int wl1271_event_ps_report(struct wl1271 *wl, break; } - /* make sure the firmware goes to active mode */ + /* make sure the firmware goes to active mode - the frame to + be sent next will indicate to the AP, that we are active. */ ret = wl1271_ps_set_mode(wl, STATION_ACTIVE_MODE, false); break; |