Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 899e6e65 authored by Kalle Valo's avatar Kalle Valo Committed by John W. Linville
Browse files

wl1271: get pspoll and nullfunc templates from mac80211 



mac80211 now can create pspoll and nullfunc templates, better to use those.

Signed-off-by: default avatarKalle Valo <kalle.valo@nokia.com>
Reviewed-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 12bd8949

drivers/net/wireless/wl12xx/wl1271_cmd.c

+20 −24
Original line number Diff line number Diff line
@@ -776,41 +776,37 @@ static int wl1271_build_extended_rates(u8 *rates, u8 band) 


int wl1271_cmd_build_null_data(struct wl1271 *wl)

{

	struct wl12xx_null_data_template template;

	struct sk_buff *skb;

	int ret = 0;



	if (!is_zero_ether_addr(wl->bssid)) {

		memcpy(template.header.da, wl->bssid, ETH_ALEN);

		memcpy(template.header.bssid, wl->bssid, ETH_ALEN);

	} else {

		memset(template.header.da, 0xff, ETH_ALEN);

		memset(template.header.bssid, 0xff, ETH_ALEN);

	}

	skb = ieee80211_nullfunc_get(wl->hw, wl->vif);

	if (!skb)

		goto out;



	memcpy(template.header.sa, wl->mac_addr, ETH_ALEN);

	template.header.frame_ctl = cpu_to_le16(IEEE80211_FTYPE_DATA |

						IEEE80211_STYPE_NULLFUNC |

						IEEE80211_FCTL_TODS);

	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_NULL_DATA, skb->data,

				      skb->len);



	return wl1271_cmd_template_set(wl, CMD_TEMPL_NULL_DATA, &template,

				       sizeof(template));

out:

	dev_kfree_skb(skb);

	return ret;



}



int wl1271_cmd_build_ps_poll(struct wl1271 *wl, u16 aid)

{

	struct wl12xx_ps_poll_template template;



	memcpy(template.bssid, wl->bssid, ETH_ALEN);

	memcpy(template.ta, wl->mac_addr, ETH_ALEN);



	/* aid in PS-Poll has its two MSBs each set to 1 */

	template.aid = cpu_to_le16(1 << 15 | 1 << 14 | aid);

	struct sk_buff *skb;

	int ret = 0;



	template.fc = cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_PSPOLL);

	skb = ieee80211_pspoll_get(wl->hw, wl->vif);

	if (!skb)

		goto out;



	return wl1271_cmd_template_set(wl, CMD_TEMPL_PS_POLL, &template,

				       sizeof(template));

	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_PS_POLL, skb->data,

				      skb->len);



out:

	dev_kfree_skb(skb);

	return ret;

}



int wl1271_cmd_build_probe_req(struct wl1271 *wl, u8 *ssid, size_t ssid_len,