From 066212702b067ab6b6b3886edd92b9c508514222 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Thu, 4 Feb 2021 10:54:22 +0000 Subject: mpls: MPLS Hash fixes Type: fix MPLS hash includes the IP hash at the bottom of the stack. Default this to the IP default and use the value passed in to the compute function. Signed-off-by: Neale Ranns Change-Id: I3f8cb0f7c4fe98ea903a752c2b5fd3d7e26d449a --- src/vnet/mpls/mpls_lookup.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/vnet/mpls/mpls_lookup.h') diff --git a/src/vnet/mpls/mpls_lookup.h b/src/vnet/mpls/mpls_lookup.h index 81c67cef8ee..db1cf3d776f 100644 --- a/src/vnet/mpls/mpls_lookup.h +++ b/src/vnet/mpls/mpls_lookup.h @@ -96,14 +96,14 @@ mpls_compute_flow_hash (const mpls_unicast_header_t * hdr, { case 4: /* incorporate the v4 flow-hash */ - hash ^= ip4_compute_flow_hash ((const ip4_header_t *)hdr, - IP_FLOW_HASH_DEFAULT); - break; + hash ^= + ip4_compute_flow_hash ((const ip4_header_t *) hdr, flow_hash_config); + break; case 6: /* incorporate the v6 flow-hash */ - hash ^= ip6_compute_flow_hash ((const ip6_header_t *)hdr, - IP_FLOW_HASH_DEFAULT); - break; + hash ^= + ip6_compute_flow_hash ((const ip6_header_t *) hdr, flow_hash_config); + break; case 5: /* incorporate the bier flow-hash */ hash ^= bier_compute_flow_hash ((const bier_hdr_t *)hdr); -- cgit 1.2.3-korg