diff options
| author |   Kalle Valo <kalle.valo@nokia.com> | 2009-11-17 18:49:00 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2009-11-18 17:09:21 -0500 |
| commit | 2410378a4c8e978823354ab3e44cd07c3c18a237 (patch) | |
| tree | e03fc032433927a8aaa1af58737a0e1340a461a8 /drivers/net/wireless/wl12xx/wl1251_main.c | |
| parent | wl1251: allocate space for firmware with vmalloc() (diff) | |
| download | linux-dev-2410378a4c8e978823354ab3e44cd07c3c18a237.tar.xz linux-dev-2410378a4c8e978823354ab3e44cd07c3c18a237.zip | |
wl1251: mask aid bits 14 and 15 in ps-poll template
In ps-poll template aid bits 14 and 15 were not masked as required by the
standard. Mask them so that aid is sent in correct format.
Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Vidhya Govindan <vidhya.govindan@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1251_main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c index 1f4c238a3371..41f5ad49f480 100644 --- a/drivers/net/wireless/wl12xx/wl1251_main.c +++ b/drivers/net/wireless/wl12xx/wl1251_main.c @@ -580,7 +580,10 @@ static int wl1251_build_ps_poll(struct wl1251 *wl, u16 aid) memcpy(template.bssid, wl->bssid, ETH_ALEN); memcpy(template.ta, wl->mac_addr, ETH_ALEN); - template.aid = aid; + + /* aid in PS-Poll has its two MSBs each set to 1 */ + template.aid = cpu_to_le16(1 << 15 | 1 << 14 | aid); + template.fc = cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_PSPOLL); return wl1251_cmd_template_set(wl, CMD_PS_POLL, &template, |