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

Commit 061bcf04 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: fix lan-pipe socket buf memory accounting"

parents 96fdf7fe 0ca6b811

drivers/platform/msm/ipa/ipa_dp.c

+10 −0
Original line number Diff line number Diff line
@@ -1781,6 +1781,9 @@ static int ipa_lan_rx_pyld_hdlr(struct sk_buff *skb, 
	unsigned char *buf;

	bool drop_packet;

	int src_pipe;

	unsigned int used = *(unsigned int *)skb->cb;

	unsigned int used_align = ALIGN(used, 32);

	unsigned long unused = IPA_GENERIC_RX_BUFF_BASE_SZ - used;



	IPA_DUMP_BUFF(skb->data, 0, skb->len);
@@ -1813,6 +1816,8 @@ static int ipa_lan_rx_pyld_hdlr(struct sk_buff *skb, 
						skb->data, sys->len_rem);

					skb_trim(skb2,

						skb2->len - sys->len_pad);

					skb2->truesize = skb2->len +

						sizeof(struct sk_buff);

					sys->ep->client_notify(sys->ep->priv,

						IPA_RECEIVE,

						(unsigned long)(skb2));
@@ -1962,6 +1967,11 @@ begin: 
					if (drop_packet)

						dev_kfree_skb_any(skb2);

					else {

					skb2->truesize = skb2->len +

						sizeof(struct sk_buff) +

						(ALIGN(len +

						IPA_PKT_STATUS_SIZE, 32) *

						unused / used_align);

						sys->ep->client_notify(

							sys->ep->priv,

							IPA_RECEIVE,

drivers/platform/msm/ipa/ipa_i.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#define IPA_QMAP_HEADER_LENGTH (4)

#define IPA_DL_CHECKSUM_LENGTH (8)

#define IPA_NUM_DESC_PER_SW_TX (2)

#define IPA_GENERIC_RX_POOL_SZ 32

#define IPA_GENERIC_RX_POOL_SZ 192



#define IPADBG(fmt, args...) \

	pr_debug(DRV_NAME " %s:%d " fmt, __func__, __LINE__, ## args)