diff options
| author |   Ido Barnea <ibarnea@cisco.com> | 2015-12-14 05:12:45 +0200 |
|---|---|---|
| committer | Ido Barnea <ibarnea@cisco.com> | 2015-12-27 08:51:30 +0200 |
| commit | 7de16b05fa2ef6feeec8370b36037a59aeb1f8e5 (patch) | |
| tree | b989ba0dc8668d60e7a24a497bee7e9ed2bddafb /src/dpdk22/drivers/net/i40e/i40e_fdir.c | |
| parent | 509648b87434b9032d38b8ca5ad470ba3edcc036 (diff) | |
Changes only to DPDK files: dpdk22 40G fixes for TTL and ip_protocol match and IPv6 support + TX hang issue fix
Diffstat (limited to 'src/dpdk22/drivers/net/i40e/i40e_fdir.c')
| -rw-r--r-- | src/dpdk22/drivers/net/i40e/i40e_fdir.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/src/dpdk22/drivers/net/i40e/i40e_fdir.c b/src/dpdk22/drivers/net/i40e/i40e_fdir.c index 9ad6981c..194f8629 100644 --- a/src/dpdk22/drivers/net/i40e/i40e_fdir.c +++ b/src/dpdk22/drivers/net/i40e/i40e_fdir.c @@ -719,7 +719,8 @@ i40e_fdir_fill_eth_ip_head(const struct rte_eth_fdir_input *fdir_input, ip->version_ihl = I40E_FDIR_IP_DEFAULT_VERSION_IHL; /* set len to by default */ ip->total_length = rte_cpu_to_be_16(I40E_FDIR_IP_DEFAULT_LEN); - ip->time_to_live = I40E_FDIR_IP_DEFAULT_TTL; + // TREX_PATCH + ip->time_to_live = fdir_input->flow.ip4_flow.ttl; /* * The source and destination fields in the transmitted packet * need to be presented in a reversed order with respect @@ -727,7 +728,13 @@ i40e_fdir_fill_eth_ip_head(const struct rte_eth_fdir_input *fdir_input, */ ip->src_addr = fdir_input->flow.ip4_flow.dst_ip; ip->dst_addr = fdir_input->flow.ip4_flow.src_ip; - ip->next_proto_id = next_proto[fdir_input->flow_type]; + // TREX_PATCH + if (fdir_input->flow_type == RTE_ETH_FLOW_FRAG_IPV4 + || fdir_input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV4_OTHER) { + ip->next_proto_id = fdir_input->flow.ip4_flow.l4_protocol; + } else { + ip->next_proto_id = next_proto[fdir_input->flow_type]; + } break; case RTE_ETH_FLOW_NONFRAG_IPV6_TCP: case RTE_ETH_FLOW_NONFRAG_IPV6_UDP: @@ -741,7 +748,8 @@ i40e_fdir_fill_eth_ip_head(const struct rte_eth_fdir_input *fdir_input, rte_cpu_to_be_32(I40E_FDIR_IPv6_DEFAULT_VTC_FLOW); ip6->payload_len = rte_cpu_to_be_16(I40E_FDIR_IPv6_PAYLOAD_LEN); - ip6->hop_limits = I40E_FDIR_IPv6_DEFAULT_HOP_LIMITS; + // TREX_PATCH + ip6->hop_limits = fdir_input->flow.ipv6_flow.hop_limit; /* * The source and destination fields in the transmitted packet @@ -754,7 +762,13 @@ i40e_fdir_fill_eth_ip_head(const struct rte_eth_fdir_input *fdir_input, rte_memcpy(&(ip6->dst_addr), &(fdir_input->flow.ipv6_flow.src_ip), IPV6_ADDR_LEN); - ip6->proto = next_proto[fdir_input->flow_type]; + // TREX_PATCH + if (fdir_input->flow_type == RTE_ETH_FLOW_FRAG_IPV6 + || fdir_input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV6_OTHER) { + ip6->proto = fdir_input->flow.ipv6_flow.l4_protocol; + } else { + ip6->proto = next_proto[fdir_input->flow_type]; + } break; default: PMD_DRV_LOG(ERR, "unknown flow type %u.", |