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

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

Merge "msm: ipa: Add vlan id field for ip collision"

parents 2d5c14b8 e2936a72

include/uapi/linux/msm_ipa.h

+2 −0
Original line number Diff line number Diff line
@@ -3206,6 +3206,7 @@ enum ipacm_hw_index_counter_virtual_type { 
 * @pdn_cfg_type: type of the pdn config applied.

 * @enable: enable/disable pdn config type.

 * @u.collison_cfg.pdn_ip_addr: pdn_ip_address used in collision config.

 * @u.collison_cfg.vlan_id; VLAN ID of the client.

 * @u.passthrough_cfg.pdn_ip_addr: pdn_ip_address used in passthrough config.

 * @u.passthrough_cfg.device_type: Device type of the client.

 * @u.passthrough_cfg.vlan_id: VLAN ID of the client.
@@ -3221,6 +3222,7 @@ struct ipa_ioc_pdn_config { 
	union {

		struct ipa_pdn_ip_collision_cfg {

			__u32 pdn_ip_addr;

			__u16 vlan_id;

		} collison_cfg;



		struct ipa_pdn_ip_passthrough_cfg {