Commit 2410378a authored Nov 17, 2009 by Kalle Valo Committed by John W. Linville Nov 18, 2009

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>

parent c74ddfd5

drivers/net/wireless/wl12xx/wl1251_main.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -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,

Admin message