From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rcdn-iport-8.cisco.com (rcdn-iport-8.cisco.com [173.37.86.79]) by dpdk.org (Postfix) with ESMTP id 41E7EFFA for ; Fri, 3 Feb 2017 10:52:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=2241; q=dns/txt; s=iport; t=1486115544; x=1487325144; h=from:to:cc:subject:date:message-id; bh=khgVx08+A+4+cw4mvXof2M2PwdDd+gBHxZtFLGRKdW4=; b=ZsVIPfXnUYIBAZWcRkZtgpFFf96Vv+LCy+5YYnmSb6v/pkHmEPfBdEiM TZIZGY+E/LCYE9b0WIK47/RIuwQ1TXyOTambSUX2JWizqmUAx5osPS5oL vv2MX2uhv8WQUoyDtcAeAs5ieOyaWeFVTu/unIOrvfOQKWpVfU8G3P1bL M=; X-IronPort-AV: E=Sophos;i="5.33,328,1477958400"; d="scan'208";a="202292792" Received: from alln-core-12.cisco.com ([173.36.13.134]) by rcdn-iport-8.cisco.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 03 Feb 2017 09:52:22 +0000 Received: from cisco.com (savbu-usnic-a.cisco.com [10.193.184.48]) by alln-core-12.cisco.com (8.14.5/8.14.5) with ESMTP id v139qLAU027643; Fri, 3 Feb 2017 09:52:21 GMT Received: by cisco.com (Postfix, from userid 392789) id AF4BD3FAAEB5; Fri, 3 Feb 2017 01:52:21 -0800 (PST) From: John Daley To: johnda888@gmail.com Cc: John Daley , stable@dpdk.org Date: Fri, 3 Feb 2017 01:52:17 -0800 Message-Id: <20170203095218.32015-1-johndale@cisco.com> X-Mailer: git-send-email 2.10.0 Subject: [dpdk-stable] [PATCH 1/2] net/enic: fix hardcoding of some flow director masks X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2017 09:52:24 -0000 Hard coded mask values were being used for several of the IPv4 and IPv6 fields. Use the values in the rte_eth_fdir_masks structure provided by the caller. Fixes: dfbd6a9cb504 ("net/enic: extend flow director support for 1300 series") Cc: stable@dpdk.org Signed-off-by: John Daley --- drivers/net/enic/enic_clsf.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/enic/enic_clsf.c b/drivers/net/enic/enic_clsf.c index bcf479a..c2218fe 100644 --- a/drivers/net/enic/enic_clsf.c +++ b/drivers/net/enic/enic_clsf.c @@ -211,15 +211,15 @@ copy_fltr_v2(struct filter_v2 *fltr, struct rte_eth_fdir_input *input, memset(&ip4_val, 0, sizeof(struct ipv4_hdr)); if (input->flow.ip4_flow.tos) { - ip4_mask.type_of_service = 0xff; + ip4_mask.type_of_service = masks->ipv4_mask.tos; ip4_val.type_of_service = input->flow.ip4_flow.tos; } if (input->flow.ip4_flow.ttl) { - ip4_mask.time_to_live = 0xff; + ip4_mask.time_to_live = masks->ipv4_mask.ttl; ip4_val.time_to_live = input->flow.ip4_flow.ttl; } if (input->flow.ip4_flow.proto) { - ip4_mask.next_proto_id = 0xff; + ip4_mask.next_proto_id = masks->ipv4_mask.proto; ip4_val.next_proto_id = input->flow.ip4_flow.proto; } if (input->flow.ip4_flow.src_ip) { @@ -299,7 +299,7 @@ copy_fltr_v2(struct filter_v2 *fltr, struct rte_eth_fdir_input *input, memset(&ipv6_val, 0, sizeof(struct ipv6_hdr)); if (input->flow.ipv6_flow.proto) { - ipv6_mask.proto = 0xff; + ipv6_mask.proto = masks->ipv6_mask.proto; ipv6_val.proto = input->flow.ipv6_flow.proto; } for (i = 0; i < 4; i++) { @@ -315,11 +315,11 @@ copy_fltr_v2(struct filter_v2 *fltr, struct rte_eth_fdir_input *input, input->flow.ipv6_flow.dst_ip[i]; } if (input->flow.ipv6_flow.tc) { - ipv6_mask.vtc_flow = 0x00ff0000; + ipv6_mask.vtc_flow = masks->ipv6_mask.tc << 16); ipv6_val.vtc_flow = input->flow.ipv6_flow.tc << 16; } if (input->flow.ipv6_flow.hop_limits) { - ipv6_mask.hop_limits = 0xff; + ipv6_mask.hop_limits = masks->ipv6_mask.hop_limits; ipv6_val.hop_limits = input->flow.ipv6_flow.hop_limits; } -- 2.10.0