diff options
| -rw-r--r-- | src/vnet/flow/flow.h | 10 | ||||
| -rw-r--r-- | src/vnet/flow/flow_cli.c | 2 | ||||
| -rw-r--r-- | src/vnet/flow/flow_types.api | 6 |
3 files changed, 8 insertions, 10 deletions
diff --git a/src/vnet/flow/flow.h b/src/vnet/flow/flow.h index 04305edf92a..3ae5b6bdc47 100644 --- a/src/vnet/flow/flow.h +++ b/src/vnet/flow/flow.h @@ -89,13 +89,11 @@ _fe(ip_port_and_mask_t, src_port) \ _fe(ip_port_and_mask_t, dst_port) -#define foreach_flow_entry_ip4_vxlan \ - foreach_flow_entry_ip4_n_tuple \ - _fe(u16, vni) +#define foreach_flow_entry_ip4_vxlan \ + foreach_flow_entry_ip4_n_tuple _fe (u32, vni) -#define foreach_flow_entry_ip6_vxlan \ - foreach_flow_entry_ip6_n_tuple \ - _fe(u16, vni) +#define foreach_flow_entry_ip6_vxlan \ + foreach_flow_entry_ip6_n_tuple _fe (u32, vni) #define foreach_flow_entry_ip4_gtpc \ foreach_flow_entry_ip4_n_tuple \ diff --git a/src/vnet/flow/flow_cli.c b/src/vnet/flow/flow_cli.c index aea2534ec1a..e2a3141c551 100644 --- a/src/vnet/flow/flow_cli.c +++ b/src/vnet/flow/flow_cli.c @@ -353,7 +353,7 @@ test_flow (vlib_main_t * vm, unformat_input_t * input, u32 hw_if_index = ~0, flow_index = ~0; int rv; u32 teid = 0, session_id = 0, spi = 0; - u16 vni = 0; + u32 vni = 0; vnet_flow_type_t type = VNET_FLOW_TYPE_UNKNOWN; ip4_address_and_mask_t ip4s = { }; ip4_address_and_mask_t ip4d = { }; diff --git a/src/vnet/flow/flow_types.api b/src/vnet/flow/flow_types.api index 7df46d2131d..86f7ce128cb 100644 --- a/src/vnet/flow/flow_types.api +++ b/src/vnet/flow/flow_types.api @@ -14,7 +14,7 @@ * limitations under the License. */ -option version = "0.0.2"; +option version = "0.0.3"; import "vnet/ethernet/ethernet_types.api"; import "vnet/ip/ip_types.api"; @@ -157,7 +157,7 @@ typedef flow_ip4_vxlan vl_api_ip_prot_and_mask_t protocol; vl_api_ip_port_and_mask_t src_port; vl_api_ip_port_and_mask_t dst_port; - u16 vni; + u32 vni; }; typedef flow_ip6_vxlan @@ -168,7 +168,7 @@ typedef flow_ip6_vxlan vl_api_ip_prot_and_mask_t protocol; vl_api_ip_port_and_mask_t src_port; vl_api_ip_port_and_mask_t dst_port; - u16 vni; + u32 vni; }; typedef flow_ip4_gtpc |