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_watch.c | |
| 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_watch.c')
| -rw-r--r-- | src/vnet/ip-neighbor/ip_neighbor_watch.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/vnet/ip-neighbor/ip_neighbor_watch.c b/src/vnet/ip-neighbor/ip_neighbor_watch.c index 7464ee62189..71d6440641d 100644 --- a/src/vnet/ip-neighbor/ip_neighbor_watch.c +++ b/src/vnet/ip-neighbor/ip_neighbor_watch.c @@ -114,15 +114,13 @@ ip_neighbor_watch_cmp (const ip_neighbor_watcher_t * w1, } void -ip_neighbor_watch (const ip46_address_t * ip, - ip46_type_t type, +ip_neighbor_watch (const ip_address_t * ip, u32 sw_if_index, const ip_neighbor_watcher_t * watch) { ip_neighbor_key_t key = { .ipnk_ip = *ip, .ipnk_sw_if_index = (sw_if_index == 0 ? ~0 : sw_if_index), - .ipnk_type = type, }; ip_neighbor_watcher_t *ipws = NULL; uword *p; @@ -145,15 +143,13 @@ ip_neighbor_watch (const ip46_address_t * ip, } void -ip_neighbor_unwatch (const ip46_address_t * ip, - ip46_type_t type, +ip_neighbor_unwatch (const ip_address_t * ip, u32 sw_if_index, const ip_neighbor_watcher_t * watch) { ip_neighbor_key_t key = { .ipnk_ip = *ip, .ipnk_sw_if_index = (sw_if_index == 0 ? ~0 : sw_if_index), - .ipnk_type = type, }; ip_neighbor_watcher_t *ipws = NULL; uword *p; @@ -211,7 +207,7 @@ ip_neighbor_publish (index_t ipni) ip_neighbor_signal ((ip_neighbor_watcher_t*) p[0], ipni); } - ip46_address_reset (&key.ipnk_ip); + ip_address_reset (&key.ipnk_ip); p = mhash_get (&ipnw_db.ipnwdb_hash, &key); if (p) { |