Commit 9fe504a1 authored by Sergey Matyukevich's avatar Sergey Matyukevich Committed by Kalle Valo
Browse files

qtnfmac: switch to 32bit values for RTS/FRAG thresholds 



Host wireless stack uses u32 type for RTS/FRAG threshold values.
Switch to u32 in driver: pass u32 values to firmware and let
firmware properly adapt these values according to its
internal representation.

Signed-off-by: default avatarSergey Matyukevich <sergey.matyukevich.os@quantenna.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent de624a35

drivers/net/wireless/quantenna/qtnfmac/commands.c

+4 −4
Original line number Diff line number Diff line
@@ -1563,11 +1563,11 @@ static int qtnf_cmd_resp_proc_phy_params(struct qtnf_wmac *mac, 
		switch (tlv_type) {

		case QTN_TLV_ID_FRAG_THRESH:

			phy_thr = (void *)tlv;

			mac_info->frag_thr = (u32)le16_to_cpu(phy_thr->thr);

			mac_info->frag_thr = le32_to_cpu(phy_thr->thr);

			break;

		case QTN_TLV_ID_RTS_THRESH:

			phy_thr = (void *)tlv;

			mac_info->rts_thr = (u32)le16_to_cpu(phy_thr->thr);

			mac_info->rts_thr = le32_to_cpu(phy_thr->thr);

			break;

		case QTN_TLV_ID_SRETRY_LIMIT:

			limit = (void *)tlv;
@@ -1815,10 +1815,10 @@ int qtnf_cmd_send_update_phy_params(struct qtnf_wmac *mac, u32 changed) 
	qtnf_bus_lock(mac->bus);



	if (changed & WIPHY_PARAM_FRAG_THRESHOLD)

		qtnf_cmd_skb_put_tlv_u16(cmd_skb, QTN_TLV_ID_FRAG_THRESH,

		qtnf_cmd_skb_put_tlv_u32(cmd_skb, QTN_TLV_ID_FRAG_THRESH,

					 wiphy->frag_threshold);

	if (changed & WIPHY_PARAM_RTS_THRESHOLD)

		qtnf_cmd_skb_put_tlv_u16(cmd_skb, QTN_TLV_ID_RTS_THRESH,

		qtnf_cmd_skb_put_tlv_u32(cmd_skb, QTN_TLV_ID_RTS_THRESH,

					 wiphy->rts_threshold);

	if (changed & WIPHY_PARAM_COVERAGE_CLASS)

		qtnf_cmd_skb_put_tlv_u8(cmd_skb, QTN_TLV_ID_COVERAGE_CLASS,

drivers/net/wireless/quantenna/qtnfmac/qlink.h

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#include <linux/ieee80211.h>



#define QLINK_PROTO_VER		11

#define QLINK_PROTO_VER		12



#define QLINK_MACID_RSVD		0xFF

#define QLINK_VIFID_RSVD		0xFF
@@ -1184,7 +1184,7 @@ struct qlink_iface_limit_record { 


struct qlink_tlv_frag_rts_thr {

	struct qlink_tlv_hdr hdr;

	__le16 thr;

	__le32 thr;

} __packed;



struct qlink_tlv_rlimit {

drivers/net/wireless/quantenna/qtnfmac/qlink_util.h

+11 −0
Original line number Diff line number Diff line
@@ -69,6 +69,17 @@ static inline void qtnf_cmd_skb_put_tlv_u16(struct sk_buff *skb, 
	memcpy(hdr->val, &tmp, sizeof(tmp));

}



static inline void qtnf_cmd_skb_put_tlv_u32(struct sk_buff *skb,

					    u16 tlv_id, u32 value)

{

	struct qlink_tlv_hdr *hdr = skb_put(skb, sizeof(*hdr) + sizeof(value));

	__le32 tmp = cpu_to_le32(value);



	hdr->type = cpu_to_le16(tlv_id);

	hdr->len = cpu_to_le16(sizeof(value));

	memcpy(hdr->val, &tmp, sizeof(tmp));

}



u16 qlink_iface_type_to_nl_mask(u16 qlink_type);

u8 qlink_chan_width_mask_to_nl(u16 qlink_mask);

void qlink_chandef_q2cfg(struct wiphy *wiphy,