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

Commit c3597af0 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 support to specify Ethernet header offset attribute"

parents 3e41bc8b eb850550

drivers/platform/msm/ipa/ipa_hdr.c

+4 −0
Original line number Diff line number Diff line
@@ -239,6 +239,8 @@ static int __ipa_add_hdr(struct ipa_hdr_add *hdr) 
	entry->hdr_len = hdr->hdr_len;

	strlcpy(entry->name, hdr->name, IPA_RESOURCE_NAME_MAX);

	entry->is_partial = hdr->is_partial;

	entry->is_eth2_ofst_valid = hdr->is_eth2_ofst_valid;

	entry->eth2_ofst = hdr->eth2_ofst;

	entry->cookie = IPA_COOKIE;



	if (hdr->hdr_len <= ipa_hdr_bin_sz[IPA_HDR_BIN0])
@@ -676,6 +678,8 @@ int ipa_copy_hdr(struct ipa_ioc_copy_hdr *copy) 
		memcpy(copy->hdr, entry->hdr, entry->hdr_len);

		copy->hdr_len = entry->hdr_len;

		copy->is_partial = entry->is_partial;

		copy->is_eth2_ofst_valid = entry->is_eth2_ofst_valid;

		copy->eth2_ofst = entry->eth2_ofst;

		result = 0;

	}

	mutex_unlock(&ipa_ctx->lock);

drivers/platform/msm/ipa/ipa_i.h

+4 −0
Original line number Diff line number Diff line
@@ -203,6 +203,8 @@ struct ipa_rt_tbl { 
 * @offset_entry: entry's offset

 * @cookie: cookie used for validity check

 * @ref_cnt: reference counter of raouting table

 * @is_eth2_ofst_valid: is eth2_ofst field valid?

 * @eth2_ofst: offset to start of Ethernet-II/802.3 header

 */

struct ipa_hdr_entry {

	struct list_head link;
@@ -214,6 +216,8 @@ struct ipa_hdr_entry { 
	u32 cookie;

	u32 ref_cnt;

	int id;

	u8 is_eth2_ofst_valid;

	u16 eth2_ofst;

};



/**

include/uapi/linux/msm_ipa.h

+8 −0
Original line number Diff line number Diff line
@@ -474,6 +474,8 @@ struct ipa_rt_rule { 
 * @status:	out paramerer, status of header add operation,

 *		0 for success,

 *		-1 for failure

 * @is_eth2_ofst_valid: is eth2_ofst field valid?

 * @eth2_ofst: offset to start of Ethernet-II/802.3 header

 */

struct ipa_hdr_add {

	char name[IPA_RESOURCE_NAME_MAX];
@@ -482,6 +484,8 @@ struct ipa_hdr_add { 
	uint8_t is_partial;

	uint32_t hdr_hdl;

	int status;

	uint8_t is_eth2_ofst_valid;

	uint16_t eth2_ofst;

};



/**
@@ -508,12 +512,16 @@ struct ipa_ioc_add_hdr { 
 *	valid only when ioctl return val is non-negative

 * @is_partial:	out parameter, indicates whether specified header is partial

 *		valid only when ioctl return val is non-negative

 * @is_eth2_ofst_valid: is eth2_ofst field valid?

 * @eth2_ofst: offset to start of Ethernet-II/802.3 header

 */

struct ipa_ioc_copy_hdr {

	char name[IPA_RESOURCE_NAME_MAX];

	uint8_t hdr[IPA_HDR_MAX_SIZE];

	uint8_t hdr_len;

	uint8_t is_partial;

	uint8_t is_eth2_ofst_valid;

	uint16_t eth2_ofst;

};



/**