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

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

Merge "msm: ipa: Add easymesh R2 support in header"

parents e186eb0c ecbb3cbc

include/linux/ipa_wdi3.h

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ struct ipa_wdi_hdr_info { 
 */

struct ipa_wdi_reg_intf_in_params {

	const char *netdev_name;

	struct ipa_wdi_hdr_info hdr_info[IPA_IP_MAX];

	struct ipa_wdi_hdr_info hdr_info[IPA_IP_MAX_WLAN];

	enum ipa_client_type alt_dst_pipe;

	u8 is_meta_data_valid;

	u32 meta_data;

include/uapi/linux/msm_ipa.h

+8 −3
Original line number Diff line number Diff line
@@ -698,7 +698,10 @@ enum ipa3_nat_mem_in { 
enum ipa_ip_type {

	IPA_IP_v4,

	IPA_IP_v6,

	IPA_IP_MAX

	IPA_IP_MAX,

	IPA_IP_v4_VLAN = IPA_IP_MAX,

	IPA_IP_v6_VLAN,

	IPA_IP_MAX_WLAN

};



#define VALID_IPA_IP_TYPE(t) \
@@ -3179,11 +3182,13 @@ enum ipa_vlan_ifaces { 
	IPA_VLAN_IF_ETH0,

	IPA_VLAN_IF_ETH1,

	IPA_VLAN_IF_RNDIS,

	IPA_VLAN_IF_ECM

	IPA_VLAN_IF_ECM,

	IPA_VLAN_IF_WLAN

};



#define IPA_VLAN_IF_EMAC IPA_VLAN_IF_ETH

#define IPA_VLAN_IF_MAX (IPA_VLAN_IF_ECM + 1)

#define IPA_VLAN_IF_WLAN IPA_VLAN_IF_WLAN

#define IPA_VLAN_IF_MAX (IPA_VLAN_IF_WLAN + 1)



/**

 * struct ipa_get_vlan_mode - get vlan mode of a Lan interface