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

Commit 8bd5bca8 authored by Kalle Valo's avatar Kalle Valo
Browse files

ath6kl: add rx data padding support 



Needed when using USB.

Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent cfc10f24

drivers/net/wireless/ath/ath6kl/txrx.c

+7 −0
Original line number Diff line number Diff line
@@ -1287,6 +1287,7 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet) 
	struct wmi_data_hdr *dhdr;

	int min_hdr_len;

	u8 meta_type, dot11_hdr = 0;

	u8 pad_before_data_start;

	int status = packet->status;

	enum htc_endpoint_id ept = packet->endpoint;

	bool is_amsdu, prev_ps, ps_state = false;
@@ -1498,6 +1499,10 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet) 
	seq_no = wmi_data_hdr_get_seqno(dhdr);

	meta_type = wmi_data_hdr_get_meta(dhdr);

	dot11_hdr = wmi_data_hdr_get_dot11(dhdr);

	pad_before_data_start =

		(le16_to_cpu(dhdr->info3) >> WMI_DATA_HDR_PAD_BEFORE_DATA_SHIFT)

			& WMI_DATA_HDR_PAD_BEFORE_DATA_MASK;



	skb_pull(skb, sizeof(struct wmi_data_hdr));



	switch (meta_type) {
@@ -1516,6 +1521,8 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet) 
		break;

	}



	skb_pull(skb, pad_before_data_start);



	if (dot11_hdr)

		status = ath6kl_wmi_dot11_hdr_remove(ar->wmi, skb);

	else if (!is_amsdu)

drivers/net/wireless/ath/ath6kl/wmi.h

+3 −0
Original line number Diff line number Diff line
@@ -182,6 +182,9 @@ enum wmi_data_hdr_flags { 
#define WMI_DATA_HDR_META_MASK      0x7

#define WMI_DATA_HDR_META_SHIFT     13



#define WMI_DATA_HDR_PAD_BEFORE_DATA_MASK               0xFF

#define WMI_DATA_HDR_PAD_BEFORE_DATA_SHIFT              0x8



/* Macros for operating on WMI_DATA_HDR (info3) field */

#define WMI_DATA_HDR_IF_IDX_MASK    0xF