diff options
| -rw-r--r-- | src/vnet/buffer.h | 1 | ||||
| -rw-r--r-- | src/vnet/l2/l2_input.c | 1 | ||||
| -rw-r--r-- | src/vnet/l2/l2_learn.c | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h index 9aba34da930..8d414fcec1e 100644 --- a/src/vnet/buffer.h +++ b/src/vnet/buffer.h @@ -177,6 +177,7 @@ typedef struct u8 l2_len; /* ethernet header length */ u8 shg; /* split-horizon group */ u16 l2fib_sn; /* l2fib bd/int seq_num */ + u8 bd_age; /* aging enabled */ } l2; /* l2tpv3 softwire encap, only valid there */ diff --git a/src/vnet/l2/l2_input.c b/src/vnet/l2/l2_input.c index 9a3148c533a..c32f0352c0a 100644 --- a/src/vnet/l2/l2_input.c +++ b/src/vnet/l2/l2_input.c @@ -210,6 +210,7 @@ classify_and_dispatch (vlib_main_t * vm, }; /* *INDENT-ON* */ vnet_buffer (b0)->l2.l2fib_sn = sn.as_u16;; + vnet_buffer (b0)->l2.bd_age = bd_config->mac_age; /* * Process bridge domain feature enables. diff --git a/src/vnet/l2/l2_learn.c b/src/vnet/l2/l2_learn.c index 488ea1ad992..1b86310c016 100644 --- a/src/vnet/l2/l2_learn.c +++ b/src/vnet/l2/l2_learn.c @@ -136,7 +136,7 @@ l2learn_process (vlib_node_runtime_t * node, /* Entry in L2FIB with matching sw_if_index matched - normal fast path */ u32 dtime = timestamp - result0->fields.timestamp; u32 dsn = result0->fields.sn.as_u16 - vnet_buffer (b0)->l2.l2fib_sn; - u32 check = dtime | dsn; + u32 check = (dtime && vnet_buffer (b0)->l2.bd_age) || dsn; if (PREDICT_TRUE (check == 0)) return; |