diff options
| author |   Neale Ranns <nranns@cisco.com> | 2020-08-20 08:22:56 +0000 |
|---|---|---|
| committer |   Ole Tr�an <otroan@employees.org> | 2020-11-20 10:27:01 +0000 |
| commit | dc617b8df442f3e25197ec64ffd58d11411b0470 (patch) | |
| tree | a573462413e12b71d71515f84e53900686424917 /src/vnet/ip-neighbor/ip_neighbor_types.h | |
| parent | d01d2ce4498dae4cbcba65784babe91d56d4bae9 (diff) | |
ip-neighbor: Use ip_address_t rather than ip46_address_t
Type: improvement
Change-Id: Ica5f395075677bda5f38d28e704f65350af88610
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/ip-neighbor/ip_neighbor_types.h')
| -rw-r--r-- | src/vnet/ip-neighbor/ip_neighbor_types.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/vnet/ip-neighbor/ip_neighbor_types.h b/src/vnet/ip-neighbor/ip_neighbor_types.h index 82c54177e80..8dfc438e7ad 100644 --- a/src/vnet/ip-neighbor/ip_neighbor_types.h +++ b/src/vnet/ip-neighbor/ip_neighbor_types.h @@ -18,7 +18,7 @@ #ifndef __INCLUDE_IP_NEIGHBOR_TYPES_H__ #define __INCLUDE_IP_NEIGHBOR_TYPES_H__ -#include <vnet/ip/ip6_packet.h> +#include <vnet/ip/ip_types.h> #include <vnet/ethernet/mac_address.h> #include <vnet/fib/fib_types.h> @@ -62,10 +62,10 @@ extern u8 *format_ip_neighbor_watcher (u8 * s, va_list * args); typedef struct ip_neighbor_key_t_ { - ip46_address_t ipnk_ip; - ip46_type_t ipnk_type; + ip_address_t ipnk_ip; + u8 __pad[3]; u32 ipnk_sw_if_index; -} ip_neighbor_key_t; +} __clib_packed ip_neighbor_key_t; /** * A representation of an IP neighbour/peer @@ -110,8 +110,7 @@ extern ip_neighbor_t *ip_neighbor_get (index_t ipni); typedef struct ip_neighbor_learn_t_ { - ip46_address_t ip; - ip46_type_t type; + ip_address_t ip; mac_address_t mac; u32 sw_if_index; } ip_neighbor_learn_t; |