diff options
| author |   Damjan Marion <damarion@cisco.com> | 2016-03-29 13:06:36 +0200 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2016-03-29 12:50:53 +0000 |
| commit | f1bd8bec8776755dfb98f1a93be0f9ee884aa7da (patch) | |
| tree | 644d2e9673c3f9b421ef391a6a5edccf52af5fd1 /vnet/vnet/ip/lookup.c | |
| parent | b2ef4dde97b51b73a596093f06cbbdb84f23a824 (diff) | |
Move classify_table_index under the union
Fields needed only by specific adj type should
be shared.
Change-Id: I59ee15a29d2f5f527f46910a1a63866b291734c7
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'vnet/vnet/ip/lookup.c')
| -rw-r--r-- | vnet/vnet/ip/lookup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vnet/vnet/ip/lookup.c b/vnet/vnet/ip/lookup.c index a6b037a3ad9..629c900a6b6 100644 --- a/vnet/vnet/ip/lookup.c +++ b/vnet/vnet/ip/lookup.c @@ -132,7 +132,7 @@ ip_add_adjacency (ip_lookup_main_t * lm, adj[i].rewrite_header.sw_if_index = ~0; adj[i].explicit_fib_index = ~0; adj[i].mcast_group_index = ~0; - adj[i].classify_table_index = ~0; + adj[i].classify.table_index = ~0; adj[i].saved_lookup_next_index = 0; if (copy_adj) @@ -958,7 +958,7 @@ u8 * format_ip_adjacency (u8 * s, va_list * args) break; case IP_LOOKUP_NEXT_CLASSIFY: - s = format (s, " table %d", adj->classify_table_index); + s = format (s, " table %d", adj->classify.table_index); default: break; @@ -1072,7 +1072,7 @@ static uword unformat_ip_adjacency (unformat_input_t * input, va_list * args) (void) unformat (input, "%d", &adj->if_address_index); else if (next == IP_LOOKUP_NEXT_CLASSIFY) { - if (!unformat (input, "%d", &adj->classify_table_index)) + if (!unformat (input, "%d", &adj->classify.table_index)) { clib_warning ("classify adj must specify table index"); return 0; |