mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 06:03:36 -04:00
Merge tag 'LA.UM.9.14.r1-24200-LAHAINA.QSSI13.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4 into android13-5.4-lahaina
"LA.UM.9.14.r1-24200-LAHAINA.QSSI13.0" * tag 'LA.UM.9.14.r1-24200-LAHAINA.QSSI13.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4: bus: mhi: Fix potential out-of-bound access rpmsg: slatecom: maintain rx_size to read rpmsg: slatecom: out of bound read from process_cmd soc: qcom: add out of bound check for AON fifo soc: qcom: smem: Add boundary checks for partitions msm: kgsl: Do not release dma and anon buffers if unmap fails msm: kgsl: Do not release dma and anon buffers if unmap fails memshare: Prevent possible integer overflow msm: kgsl: Keep the timeline fence valid for logging msm: ipa: Add support for Private IP Forwarding msm: ipa3: add support to identify wifi attach soc: qcom: minidump_log: Protect md_dump_slabinfo under SLUB_DEBUG mm: slub: Declare slab_owner_ops only when SLUB DEBUG is enabled soc: qcom: Add BLAIR-LITE SoC information to socinfo soc: qcom: socinfo: Add soc information for BLAIR LTE msm_serial_hs: Fix race between mod_timer and del_timer calls Change-Id: I5ab9a7732af0be4754b506f2c815ab29b236fb91
This commit is contained in:
commit
58d91073d9
15 changed files with 173 additions and 52 deletions
|
|
@ -2,7 +2,7 @@
|
|||
/*
|
||||
* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||
* Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||
*/
|
||||
|
||||
#ifndef _UAPI_MSM_IPA_H_
|
||||
|
|
@ -151,6 +151,7 @@
|
|||
#define IPA_IOCTL_QUERY_CACHED_DRIVER_MSG 94
|
||||
#define IPA_IOCTL_SET_EXT_ROUTER_MODE 95
|
||||
#define IPA_IOCTL_ADD_DEL_DSCP_PCP_MAPPING 96
|
||||
#define IPA_IOCTL_SEND_VLAN_MUXID_MAPPING 97
|
||||
/**
|
||||
* max size of the header to be inserted
|
||||
*/
|
||||
|
|
@ -1755,6 +1756,27 @@ struct IpaDscpVlanPcpMap_t {
|
|||
uint16_t vlan_s[IPA_EoGRE_MAX_VLAN * IPA_GRE_MAX_S_VLAN];
|
||||
} __packed;
|
||||
|
||||
|
||||
#define MAX_VLAN_CONFIGURE 16
|
||||
enum pkt_path {
|
||||
SW_PATH = 0,
|
||||
HW_PATH_OUTSIDE_TUNNEL = 1,
|
||||
HW_PATH_INSIDE_TUNNEL = 2
|
||||
};
|
||||
|
||||
/* VLANID - Action - Tunnel_ID - MUX_ID */
|
||||
struct singletag_mux_map_entry {
|
||||
uint16_t vlan_id;
|
||||
uint8_t mux_id;
|
||||
uint8_t pkt_path;
|
||||
uint32_t tunnel_id;
|
||||
};
|
||||
|
||||
struct ipa_ioc_mux_mapping_table {
|
||||
struct singletag_mux_map_entry map_entries[MAX_VLAN_CONFIGURE];
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* struct ipa_exception
|
||||
*
|
||||
|
|
@ -4077,6 +4099,11 @@ struct ipa_ioc_dscp_pcp_map_info {
|
|||
IPA_IOCTL_ADD_DEL_DSCP_PCP_MAPPING, \
|
||||
struct ipa_ioc_dscp_pcp_map_info)
|
||||
|
||||
#define IPA_IOC_SEND_VLAN_MUXID_MAPPING _IOWR(IPA_IOC_MAGIC, \
|
||||
IPA_IOCTL_SEND_VLAN_MUXID_MAPPING, \
|
||||
struct ipa_ioc_mux_mapping_table)
|
||||
|
||||
|
||||
/*
|
||||
* unique magic number of the Tethering bridge ioctls
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in a new issue