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

Commit 621f4c90 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "uapi: ipa: Support uc header proc ctx for DSCP insertion"

parents bb2468e7 14915778

include/linux/ipa_uc_offload.h

+4 −3
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.

 */



#ifndef _IPA_UC_OFFLOAD_H_
@@ -83,8 +83,9 @@ struct ntn_buff_smmu_map { 
 * @ntn_ring_size: size of the Tx/Rx ring (in terms of elements)

 * @buff_pool_base_pa: physical address of the base of the Tx/Rx buffer pool

 * @buff_pool_base_iova: virtual address of the base of the Tx/Rx buffer pool

 * @buff_pool_base_sgt: Scatter table for buffer pools,contains valid non NULL

 *			 value when EMAC S1-SMMU enabed, else NULL.

 * @buff_pool_base_sgt: Scatter table for buffer pools,contains valid

 *			non NULL value. When NULL, do continuosly

 *			pa to iova mapping (SMMU disable, pa == iova).

 * @num_buffers: Rx/Tx buffer pool size (in terms of elements)

 * @data_buff_size: size of the each data buffer allocated in DDR

 * @ntn_reg_base_ptr_pa: physical address of the Tx/Rx NTN Ring's

include/uapi/linux/msm_ipa.h

+5 −2
Original line number Diff line number Diff line
@@ -1164,9 +1164,12 @@ enum ipa_hdr_proc_type { 
	IPA_HDR_PROC_802_3_TO_802_3,

	IPA_HDR_PROC_L2TP_HEADER_ADD,

	IPA_HDR_PROC_L2TP_HEADER_REMOVE,

	IPA_HDR_PROC_ETHII_TO_ETHII_EX

	IPA_HDR_PROC_ETHII_TO_ETHII_EX,

	IPA_HDR_PROC_L2TP_UDP_HEADER_ADD,

	IPA_HDR_PROC_L2TP_UDP_HEADER_REMOVE,

	IPA_HDR_PROC_SET_DSCP

};

#define IPA_HDR_PROC_MAX (IPA_HDR_PROC_ETHII_TO_ETHII_EX + 1)

#define IPA_HDR_PROC_MAX (IPA_HDR_PROC_SET_DSCP + 1)



/**

 * struct ipa_rt_rule - attributes of a routing rule