aboutsummaryrefslogtreecommitdiffstats
path: root/src/vnet
diff options
context:
space:
mode:
authorJohn Lo <loj@cisco.com>2017-10-03 17:39:00 -0400
committerDamjan Marion <dmarion.lists@gmail.com>2017-10-04 09:37:36 +0000
commitc5c77ae50a2483fc3d7dbdb495d55f8a4f0aba5a (patch)
tree371d0f7fbb7833f815396da0d54609b43d66a9e2 /src/vnet
parent7feb35f9fecdbc518945364d3b8ba259ce42d949 (diff)
Update L2FIB entry timestamp only if BD aging enabled (VPP-1002)
Change L2 learning path so it update stale timestamp in MAC entry only if aging is enabled on the BD for the MAC entry. Change-Id: I849154fe7ad2c6c68d6a94a66ca9345f6a98bc07 Signed-off-by: John Lo <loj@cisco.com>
Diffstat (limited to 'src/vnet')
-rw-r--r--src/vnet/buffer.h1
-rw-r--r--src/vnet/l2/l2_input.c1
-rw-r--r--src/vnet/l2/l2_learn.c2
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;