diff options
Diffstat (limited to 'vswitchd')
| -rw-r--r-- | vswitchd/bridge.c | 2 | ||||
| -rw-r--r-- | vswitchd/vswitch.xml | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 02a33293e..0702cc6ca 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -1026,6 +1026,8 @@ port_configure(struct port *port) const char *pt = smap_get_def(&cfg->other_config, "priority-tags", ""); if (!strcmp(pt, "if-nonzero") || !strcmp(pt, "true")) { s.use_priority_tags = PORT_PRIORITY_TAGS_IF_NONZERO; + } else if (!strcmp(pt, "always")) { + s.use_priority_tags = PORT_PRIORITY_TAGS_ALWAYS; } else { s.use_priority_tags = PORT_PRIORITY_TAGS_NEVER; } diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml index 1613d3569..89c06a1b7 100644 --- a/vswitchd/vswitch.xml +++ b/vswitchd/vswitch.xml @@ -1877,7 +1877,7 @@ <column name="other_config" key="priority-tags" type='{"type": "string", - "enum": ["set", ["never", "if-nonzero"]]}'> + "enum": ["set", ["never", "if-nonzero", "always"]]}'> <p> An 802.1Q header contains two important pieces of information: a VLAN ID and a priority. A frame with a zero VLAN ID, called a @@ -1894,8 +1894,10 @@ </p> <p> - Regardless of this setting, Open vSwitch omits the 802.1Q header on - output if both the VLAN ID and priority would be zero. + For <code>if-nonzero</code> Open vSwitch omits the 802.1Q header on + output if both the VLAN ID and priority would be zero. Set to + <code>always</code> to retain the 802.1Q header in such frames as + well. </p> <p> |