Merge review feedback from mgsmith on upstream gerrit 33709 ps8..10

This commit is contained in:
Pim van Pelt
2021-11-29 20:04:54 +00:00
parent 6caa5e8386
commit cdf07cce34
6 changed files with 108 additions and 109 deletions

View File

@ -18,8 +18,6 @@
#include <vnet/dpo/dpo.h>
#include <vnet/adj/adj.h>
#include <vnet/ip/ip_types.h>
#include <vnet/udp/udp.h>
#include <vnet/tcp/tcp.h>
#include <plugins/lcpng/lcpng.h>
@ -165,14 +163,14 @@ lcp_itf_pair_find_by_host (u32 host_sw_if_index)
/**
* sub-interface auto creation/deletion for LCP
*/
void lcp_set_lcp_auto_subint (u8 is_auto);
int lcp_lcp_auto_subint (void);
void lcp_set_auto_subint (u8 is_auto);
int lcp_auto_subint (void);
/**
* sync state changes from VPP into LCP
*/
void lcp_set_lcp_sync (u8 is_auto);
int lcp_lcp_sync (void);
void lcp_set_sync (u8 is_auto);
int lcp_sync (void);
typedef void (*lcp_itf_pair_add_cb_t) (lcp_itf_pair_t *);
typedef void (*lcp_itf_pair_del_cb_t) (lcp_itf_pair_t *);
@ -191,18 +189,6 @@ void lcp_itf_set_link_state (const lcp_itf_pair_t *lip, u8 state);
/* Set any VPP L3 addresses on Linux host device */
void lcp_itf_set_interface_addr (const lcp_itf_pair_t *lip);
/* Sync IPv4 and IPv6 address from VPP to Linux device */
void lcp_itf_ip4_add_del_interface_addr (ip4_main_t *im, uword opaque,
u32 sw_if_index,
ip4_address_t *address,
u32 address_length,
u32 if_address_index, u32 is_del);
void lcp_itf_ip6_add_del_interface_addr (ip6_main_t *im, uword opaque,
u32 sw_if_index,
ip6_address_t *address,
u32 address_length,
u32 if_address_index, u32 is_del);
/* Sync all state from VPP to a specific Linux device, all sub-interfaces
* of a hardware interface, or all interfaces in the system.
*