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

Commit 3aafa883 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: add ucp in skb->cb"

parents c38b4fdb 086d2d2c

drivers/platform/msm/ipa/ipa_v2/ipa_dp.c

+5 −1
Original line number Diff line number Diff line
@@ -2819,10 +2819,12 @@ void ipa_lan_rx_cb(void *priv, enum ipa_dp_evt_type evt, unsigned long data) 
	struct ipa_ep_context *ep;

	unsigned int src_pipe;

	u32 metadata;

	u8 ucp;



	status = (struct ipa_hw_pkt_status *)rx_skb->data;

	src_pipe = status->endp_src_idx;

	metadata = status->metadata;

	ucp = status->ucp;

	ep = &ipa_ctx->ep[src_pipe];

	if (unlikely(src_pipe >= ipa_ctx->ipa_num_pipes ||

		!ep->valid ||
@@ -2845,8 +2847,10 @@ void ipa_lan_rx_cb(void *priv, enum ipa_dp_evt_type evt, unsigned long data) 
	   ------------------------------------------

	 */

	*(u16 *)rx_skb->cb = ((metadata >> 16) & 0xFFFF);

	*(u8 *)(rx_skb->cb + 4) = ucp;

	IPADBG_LOW("meta_data: 0x%x cb: 0x%x\n",

		metadata, *(u32 *)rx_skb->cb);

	IPADBG_LOW("ucp: %d\n", *(u8 *)(rx_skb->cb + 4));



	ep->client_notify(ep->priv, IPA_RECEIVE, (unsigned long)(rx_skb));

}

drivers/platform/msm/ipa/ipa_v3/ipa_dp.c

+4 −0
Original line number Diff line number Diff line
@@ -2915,10 +2915,12 @@ void ipa3_lan_rx_cb(void *priv, enum ipa_dp_evt_type evt, unsigned long data) 
	struct ipa3_ep_context *ep;

	unsigned int src_pipe;

	u32 metadata;

	u8 ucp;



	ipahal_pkt_status_parse(rx_skb->data, &status);

	src_pipe = status.endp_src_idx;

	metadata = status.metadata;

	ucp = status.ucp;

	ep = &ipa3_ctx->ep[src_pipe];

	if (unlikely(src_pipe >= ipa3_ctx->ipa_num_pipes ||

		!ep->valid ||
@@ -2941,8 +2943,10 @@ void ipa3_lan_rx_cb(void *priv, enum ipa_dp_evt_type evt, unsigned long data) 
	   ------------------------------------------

	 */

	*(u16 *)rx_skb->cb = ((metadata >> 16) & 0xFFFF);

	*(u8 *)(rx_skb->cb + 4) = ucp;

	IPADBG_LOW("meta_data: 0x%x cb: 0x%x\n",

			metadata, *(u32 *)rx_skb->cb);

	IPADBG_LOW("ucp: %d\n", *(u8 *)(rx_skb->cb + 4));



	ep->client_notify(ep->priv, IPA_RECEIVE, (unsigned long)(rx_skb));

}