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

Commit 023e0826 authored by Kalle Valo's avatar Kalle Valo Committed by John W. Linville
Browse files

wl1271: create qos nullfunc template 



Needed for U-APSD.

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 818e3063

drivers/net/wireless/wl12xx/wl1271_cmd.c

+22 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/crc7.h>

#include <linux/spi/spi.h>

#include <linux/etherdevice.h>

#include <linux/ieee80211.h>



#include "wl1271.h"

#include "wl1271_reg.h"
@@ -778,6 +779,27 @@ out: 
	return ret;

}



int wl1271_build_qos_null_data(struct wl1271 *wl)

{

	struct ieee80211_qos_hdr template;



	memset(&template, 0, sizeof(template));



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

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

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



	template.frame_control = cpu_to_le16(IEEE80211_FTYPE_DATA |

					     IEEE80211_STYPE_QOS_NULLFUNC |

					     IEEE80211_FCTL_TODS);



	/* FIXME: not sure what priority to use here */

	template.qos_ctrl = cpu_to_le16(0);



	return wl1271_cmd_template_set(wl, CMD_TEMPL_QOS_NULL_DATA, &template,

				       sizeof(template));

}



int wl1271_cmd_set_default_wep_key(struct wl1271 *wl, u8 id)

{

	struct wl1271_cmd_set_keys *cmd;

drivers/net/wireless/wl12xx/wl1271_cmd.h

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ int wl1271_cmd_build_ps_poll(struct wl1271 *wl, u16 aid); 
int wl1271_cmd_build_probe_req(struct wl1271 *wl,

			       const u8 *ssid, size_t ssid_len,

			       const u8 *ie, size_t ie_len, u8 band);

int wl1271_build_qos_null_data(struct wl1271 *wl);

int wl1271_cmd_set_default_wep_key(struct wl1271 *wl, u8 id);

int wl1271_cmd_set_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,

		       u8 key_size, const u8 *key, const u8 *addr,