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

Commit 1a59da9f authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 17b4d44e on remote branch 

Change-Id: I956ca2f1c0e170fd43f1026a453878ba9262c278
parents 54f8f2a6 17b4d44e

qdf/inc/i_qdf_nbuf_api_m.h

+24 −0
Original line number Diff line number Diff line
@@ -143,4 +143,28 @@ static inline uint8_t qdf_nbuf_get_rx_reo_dest_ind(qdf_nbuf_t buf) 
{

	return QDF_NBUF_CB_RX_PACKET_REO_DEST_IND(buf);

}



/**

 * qdf_nbuf_set_rx_ipa_smmu_map() - set ipa smmu mapped flag

 * @buf: Network buffer

 * @value: 1 - ipa smmu mapped, 0 - ipa smmu unmapped

 *

 * Return: none

 */

static inline void qdf_nbuf_set_rx_ipa_smmu_map(qdf_nbuf_t buf,

						uint8_t value)

{

	QDF_NBUF_CB_RX_PACKET_IPA_SMMU_MAP(buf) = value;

}



/**

 * qdf_nbuf_is_rx_ipa_smmu_map() - check ipa smmu map flag

 * @buf: Network buffer

 *

 * Return 0 or 1

 */

static inline uint8_t qdf_nbuf_is_rx_ipa_smmu_map(qdf_nbuf_t buf)

{

	return QDF_NBUF_CB_RX_PACKET_IPA_SMMU_MAP(buf);

}

#endif /* _QDF_NBUF_M_H */

qdf/inc/i_qdf_nbuf_api_w.h

+23 −0
Original line number Diff line number Diff line
@@ -132,4 +132,27 @@ static inline void qdf_nbuf_set_rx_reo_dest_ind(qdf_nbuf_t buf, 
						uint8_t value)

{

}



/**

* qdf_nbuf_set_rx_ipa_smmu_map() - set ipa smmu mapped flag

 * @buf: Network buffer

 * @value: 1 - ipa smmu mapped, 0 - ipa smmu unmapped

 *

 * Return: none

 */

static inline void qdf_nbuf_set_rx_ipa_smmu_map(qdf_nbuf_t buf,

						uint8_t value)

{

}



/**

 * qdf_nbuf_is_rx_ipa_smmu_map() - check ipa smmu map flag

 * @buf: Network buffer

 *

 * Return 0 or 1

 */

static inline uint8_t qdf_nbuf_is_rx_ipa_smmu_map(qdf_nbuf_t buf)

{

	return 0;

}

#endif /* _QDF_NBUF_W_H */

qdf/linux/src/i_qdf_nbuf.h

+3 −1
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ typedef union { 
 * @rx.dev.priv_cb_m.l3_hdr_pad: L3 header padding offset

 * @rx.dev.priv_cb_m.exc_frm: exception frame

 * @rx.dev.priv_cb_m.reo_dest_ind: reo destination indication

 * @rx.dev.priv_cb_m.ipa_smmu_map: do IPA smmu map

 * @rx.dev.priv_cb_m.tcp_seq_num: TCP sequence number

 * @rx.dev.priv_cb_m.tcp_ack_num: TCP ACK number

 * @rx.dev.priv_cb_m.lro_ctx: LRO context
@@ -230,7 +231,8 @@ struct qdf_nbuf_cb { 
						 /* exception frame flag */

						 exc_frm:1,

						 reo_dest_ind:5,

						 reserved1:10;

						 ipa_smmu_map:1,

						 reserved1:9;

					uint32_t tcp_seq_num;

					uint32_t tcp_ack_num;

					union {

qdf/linux/src/i_qdf_nbuf_m.h

+4 −0
Original line number Diff line number Diff line
@@ -81,6 +81,10 @@ 
	(((struct qdf_nbuf_cb *)((skb)->cb))->u.rx.dev.priv_cb_m. \

	reo_dest_ind)



#define  QDF_NBUF_CB_RX_PACKET_IPA_SMMU_MAP(skb) \

	 (((struct qdf_nbuf_cb *)((skb)->cb))->u.rx.dev.priv_cb_m. \

	 ipa_smmu_map)



#define __qdf_nbuf_ipa_owned_get(skb) \

	QDF_NBUF_CB_TX_IPA_OWNED(skb)

umac/cmn_services/cmn_defs/inc/wlan_cmn_ieee80211.h

+8 −0
Original line number Diff line number Diff line
@@ -204,9 +204,17 @@ 
#define WLAN_HE_6GHZ_CHWIDTH_160_80_80    3 /* 160/80+80 MHz Oper Ch width */



#define WLAN_RATE_VAL              0x7f

#define WLAN_BASIC_RATE_MASK       0x80



#define WLAN_RV(v)     ((v) & WLAN_RATE_VAL)



#define WLAN_BSS_MEMBERSHIP_SELECTOR_HT_PHY       127

#define WLAN_BSS_MEMBERSHIP_SELECTOR_VHT_PHY      126

#define WLAN_BSS_MEMBERSHIP_SELECTOR_GLK          125

#define WLAN_BSS_MEMBERSHIP_SELECTOR_EPD          124

#define WLAN_BSS_MEMBERSHIP_SELECTOR_SAE_H2E      123

#define WLAN_BSS_MEMBERSHIP_SELECTOR_HE_PHY       122



#define WLAN_CHAN_IS_5GHZ(chanidx) \

	((chanidx > 30) ? true : false)

#define WLAN_CHAN_IS_2GHZ(chanidx) \