bridge: Add active VLAN aware option

1 files changed, 21 insertions, 9 deletions

diff --git a/docs/configuration/interfaces/bridge.rst b/docs/configuration/interfaces/bridge.rst
index 17e3d50b..c53d6f51 100644
--- a/docs/configuration/interfaces/bridge.rst
+++ b/docs/configuration/interfaces/bridge.rst
@@ -116,6 +116,16 @@ links providing fault tolerance if an active link fails.
 VLAN
 ====
 
+.. note:: It is not valid to use the `vif 1` option for VLAN aware bridges
+   because VLAN aware bridges assume that all unlabeled packets belong to 
+   the default VLAN 1 member and that the VLAN ID of the bridge's parent 
+   interface is always 1
+
+.. cfgcmd:: set interfaces bridge <interface> enable-vlan
+
+   To activate the VLAN aware bridge, you must activate this setting to use VLAN 
+   settings for the bridge
+
 .. cmdinclude:: /_include/interface-vlan-8021q.txt
    :var0: bridge
    :var1: br0
@@ -160,9 +170,9 @@ Port Mirror (SPAN)
    :var1: br1
    :var2: eth3
 
-*******
-Example
-*******
+******************************
+Example: Create a basic bridge
+******************************
 
 Creating a bridge interface is very simple. In this example we will
 have:
@@ -195,9 +205,9 @@ This results in the active configuration:
     }
     stp
 
-*******
-Example
-*******
+*********************************
+Example: Using VLAN aware Bridge
+*********************************
 
 An example of creating a VLAN-aware bridge is as follows:
 
@@ -209,6 +219,7 @@ An example of creating a VLAN-aware bridge is as follows:
 
 .. code-block:: none
 
+  set interfaces bridge br100 enable-vlan
   set interfaces bridge br100 member interface eth1 allowed-vlan 10
   set interfaces bridge br100 member interface eth2 native-vlan 10
   set interfaces bridge br100 vif 10 address 192.0.2.1/24
@@ -220,6 +231,7 @@ This results in the active configuration:
 .. code-block:: none
 
    vyos@vyos# show interfaces bridge br100
+    enable-vlan
     member {
         interface eth1 {
             allowed-vlan 10
@@ -234,9 +246,9 @@ This results in the active configuration:
         address 2001:db8::ffff/64
     }
 
-*******
-Example
-*******
+********************************************************************
+Example: Using the operation mode command to view Bridge Information
+********************************************************************
 
 .. opcmd:: show bridge