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

Commit e3d73781 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: rndis_ipa: add ethernet bridging support"

parents 4344d1e3 6716f79f

drivers/net/ethernet/msm/rndis_ipa.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -1419,6 +1419,7 @@ static void rndis_ipa_prepare_header_insertion(int eth_type, 
	add_hdr->hdr_len += ETH_HLEN;

	add_hdr->hdr_len += ETH_HLEN;

	add_hdr->is_eth2_ofst_valid = true;

	add_hdr->is_eth2_ofst_valid = true;

	add_hdr->eth2_ofst = sizeof(rndis_template_hdr);

	add_hdr->eth2_ofst = sizeof(rndis_template_hdr);

	add_hdr->type = IPA_HDR_L2_ETHERNET_II;

}

}





/**

/**
@@ -1579,11 +1580,13 @@ static int rndis_ipa_register_properties(char *netdev_name) 
	ipv4_property->dst_pipe = IPA_TO_USB_CLIENT;

	ipv4_property->dst_pipe = IPA_TO_USB_CLIENT;

	strlcpy(ipv4_property->hdr_name, IPV4_HDR_NAME,

	strlcpy(ipv4_property->hdr_name, IPV4_HDR_NAME,

			IPA_RESOURCE_NAME_MAX);

			IPA_RESOURCE_NAME_MAX);

	ipv4_property->hdr_l2_type = IPA_HDR_L2_ETHERNET_II;

	ipv6_property = &tx_properties.prop[1];

	ipv6_property = &tx_properties.prop[1];

	ipv6_property->ip = IPA_IP_v6;

	ipv6_property->ip = IPA_IP_v6;

	ipv6_property->dst_pipe = IPA_TO_USB_CLIENT;

	ipv6_property->dst_pipe = IPA_TO_USB_CLIENT;

	strlcpy(ipv6_property->hdr_name, IPV6_HDR_NAME,

	strlcpy(ipv6_property->hdr_name, IPV6_HDR_NAME,

			IPA_RESOURCE_NAME_MAX);

			IPA_RESOURCE_NAME_MAX);

	ipv6_property->hdr_l2_type = IPA_HDR_L2_ETHERNET_II;

	tx_properties.num_props = 2;

	tx_properties.num_props = 2;





	rx_properties.prop = rx_ioc_properties;

	rx_properties.prop = rx_ioc_properties;
@@ -1591,10 +1594,12 @@ static int rndis_ipa_register_properties(char *netdev_name) 
	rx_ipv4_property->ip = IPA_IP_v4;

	rx_ipv4_property->ip = IPA_IP_v4;

	rx_ipv4_property->attrib.attrib_mask = 0;

	rx_ipv4_property->attrib.attrib_mask = 0;

	rx_ipv4_property->src_pipe = IPA_CLIENT_USB_PROD;

	rx_ipv4_property->src_pipe = IPA_CLIENT_USB_PROD;

	rx_ipv4_property->hdr_l2_type = IPA_HDR_L2_ETHERNET_II;

	rx_ipv6_property = &rx_properties.prop[1];

	rx_ipv6_property = &rx_properties.prop[1];

	rx_ipv6_property->ip = IPA_IP_v6;

	rx_ipv6_property->ip = IPA_IP_v6;

	rx_ipv6_property->attrib.attrib_mask = 0;

	rx_ipv6_property->attrib.attrib_mask = 0;

	rx_ipv6_property->src_pipe = IPA_CLIENT_USB_PROD;

	rx_ipv6_property->src_pipe = IPA_CLIENT_USB_PROD;

	rx_ipv6_property->hdr_l2_type = IPA_HDR_L2_ETHERNET_II;

	rx_properties.num_props = 2;

	rx_properties.num_props = 2;





	result = ipa_register_intf("rndis0", &tx_properties, &rx_properties);

	result = ipa_register_intf("rndis0", &tx_properties, &rx_properties);