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

Commit 6c18d591 authored by Mateusz Palczewski's avatar Mateusz Palczewski Committed by Greg Kroah-Hartman
Browse files

i40e: Fix add TC filter for IPv6 



[ Upstream commit 61c1e0eb8375def7c891bfe857bb795a57090526 ]

Fix insufficient distinction between IPv4 and IPv6 addresses
when creating a filter.
IPv4 and IPv6 are kept in the same memory area. If IPv6 is added,
then it's caught by IPv4 check, which leads to err -95.

Fixes: 2f4b411a ("i40e: Enable cloud filters via tc-flower")
Signed-off-by: default avatarGrzegorz Szczurek <grzegorzx.szczurek@intel.com>
Signed-off-by: default avatarMateusz Palczewski <mateusz.palczewski@intel.com>
Reviewed-by: default avatarJaroslaw Gawin <jaroslawx.gawin@intel.com>
Tested-by: default avatarTony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0f12eb7b

drivers/net/ethernet/intel/i40e/i40e_main.c

+3 −2
Original line number Diff line number Diff line
@@ -7071,7 +7071,8 @@ int i40e_add_del_cloud_filter_big_buf(struct i40e_vsi *vsi, 
		return -EOPNOTSUPP;



	/* adding filter using src_port/src_ip is not supported at this stage */

	if (filter->src_port || filter->src_ipv4 ||

	if (filter->src_port ||

	    (filter->src_ipv4 && filter->n_proto != ETH_P_IPV6) ||

	    !ipv6_addr_any(&filter->ip.v6.src_ip6))

		return -EOPNOTSUPP;
@@ -7100,7 +7101,7 @@ int i40e_add_del_cloud_filter_big_buf(struct i40e_vsi *vsi, 
			cpu_to_le16(I40E_AQC_ADD_CLOUD_FILTER_MAC_VLAN_PORT);

		}



	} else if (filter->dst_ipv4 ||

	} else if ((filter->dst_ipv4 && filter->n_proto != ETH_P_IPV6) ||

		   !ipv6_addr_any(&filter->ip.v6.dst_ip6)) {

		cld_filter.element.flags =

				cpu_to_le16(I40E_AQC_ADD_CLOUD_FILTER_IP_PORT);