aboutsummaryrefslogtreecommitdiffstats
path: root/src/vnet
diff options
context:
space:
mode:
authorJerome Tollet <jtollet@cisco.com>2017-09-14 12:53:56 +0100
committerJohn Lo <loj@cisco.com>2017-09-15 10:46:31 +0000
commit50570ecef6d37b0c9d8c002f6dadb4ed0e138aa3 (patch)
treed121b4da2c03f8852ec3c059aa27958bd3e23452 /src/vnet
parentb467b2a02be6ea7bab1a4773523afe8a8e3cfd83 (diff)
Update of free text tag patch for BD
Change-Id: Ia886ff2bfa2cf33ffbaa35ec89494d4300ec2769 Signed-off-by: Jerome Tollet <jtollet@cisco.com>
Diffstat (limited to 'src/vnet')
-rw-r--r--src/vnet/l2/l2.api1
-rw-r--r--src/vnet/l2/l2_bd.c9
-rw-r--r--src/vnet/l2/l2_bd.h1
3 files changed, 7 insertions, 4 deletions
diff --git a/src/vnet/l2/l2.api b/src/vnet/l2/l2.api
index baf830fae3b..ac923de4032 100644
--- a/src/vnet/l2/l2.api
+++ b/src/vnet/l2/l2.api
@@ -285,6 +285,7 @@ typeonly manual_print manual_endian define bridge_domain_sw_if
@param learn - learning state on all interfaces in the bd
@param arp_term - arp termination state on all interfaces in the bd
@param mac_age - mac aging time in min, 0 for disabled
+ @param bd_tag - optional textual tag for the bridge domain
@param n_sw_ifs - number of sw_if_index's in the domain
*/
manual_print manual_endian define bridge_domain_details
diff --git a/src/vnet/l2/l2_bd.c b/src/vnet/l2/l2_bd.c
index 3670a4f0db4..b1abb4c0fba 100644
--- a/src/vnet/l2/l2_bd.c
+++ b/src/vnet/l2/l2_bd.c
@@ -291,8 +291,11 @@ bd_set_mac_age (vlib_main_t * vm, u32 bd_index, u8 age)
L2_MAC_AGE_PROCESS_EVENT_STOP, 0);
}
+/**
+ Set the tag for the bridge domain.
+*/
-void
+static void
bd_set_bd_tag (vlib_main_t * vm, u32 bd_index, u8 * bd_tag)
{
u8 *old;
@@ -1191,8 +1194,8 @@ bd_add_del (l2_bridge_domain_add_del_args_t * a)
/**
Create or delete bridge-domain.
The CLI format:
- create bridge-domain <bd_index> [learn <0|1>] [forward <0|1>] [uu-flood <0|1>]
- [flood <0|1>] [arp-term <0|1>] [mac-age <nn>] [del]
+ create bridge-domain <bd_index> [learn <0|1>] [forward <0|1>] [uu-flood <0|1>] [flood <0|1>]
+ [arp-term <0|1>] [mac-age <nn>] [bd-tag <tag>] [del]
*/
static clib_error_t *
diff --git a/src/vnet/l2/l2_bd.h b/src/vnet/l2/l2_bd.h
index e60f1ab3f09..fd34ae67a83 100644
--- a/src/vnet/l2/l2_bd.h
+++ b/src/vnet/l2/l2_bd.h
@@ -134,7 +134,6 @@ u32 bd_remove_member (l2_bridge_domain_t * bd_config, u32 sw_if_index);
u32 bd_set_flags (vlib_main_t * vm, u32 bd_index, u32 flags, u32 enable);
void bd_set_mac_age (vlib_main_t * vm, u32 bd_index, u8 age);
-void bd_set_bd_tag (vlib_main_t * vm, u32 bd_index, u8 * bd_tag);
int bd_add_del (l2_bridge_domain_add_del_args_t * args);
/**