i40e: Fix add TC filter for IPv6

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: 2f4b411a3d67 ("i40e: Enable cloud filters via tc-flower")
Signed-off-by: Grzegorz Szczurek <grzegorzx.szczurek@intel.com>
Signed-off-by: Mateusz Palczewski <mateusz.palczewski@intel.com>
Reviewed-by: Jaroslaw Gawin <jaroslawx.gawin@intel.com>
Tested-by: Tony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 2e22ab5a0f9adae0016a3e81d9a74876be663f9f..3e4a4d6f0419c572b5a33bef2cd9fc7dc47bc30c 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -7731,7 +7731,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;
 
@@ -7760,7 +7761,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);