* New "ovs-appctl dpctl/ipf-get-status" command for userspace datapath
conntrack fragmentation support.
* New action "check_pkt_len".
+ * Port configuration with "other-config:priority-tags" now has a mode
+ that retains the 802.1Q header even if VLAN and priority are both zero.
- OVSDB:
* OVSDB clients can now resynchronize with clustered servers much more
quickly after a brief disconnection, saving bandwidth and CPU time.
static void xvlan_pop(struct xvlan *src);
static void xvlan_push_uninit(struct xvlan *src);
static void xvlan_extract(const struct flow *, struct xvlan *);
-static void xvlan_put(struct flow *, const struct xvlan *);
+static void xvlan_put(struct flow *, const struct xvlan *,
+ enum port_priority_tags_mode);
static void xvlan_input_translate(const struct xbundle *,
const struct xvlan *in,
struct xvlan *xvlan);
/* Put VLAN information (headers) to flow */
static void
-xvlan_put(struct flow *flow, const struct xvlan *xvlan)
+xvlan_put(struct flow *flow, const struct xvlan *xvlan,
+ enum port_priority_tags_mode use_priority_tags)
{
ovs_be16 tci;
int i;
for (i = 0; i < FLOW_MAX_VLAN_HEADERS; i++) {
tci = htons(xvlan->v[i].vid | (xvlan->v[i].pcp & VLAN_PCP_MASK));
- if (tci) {
+ if (tci || ((use_priority_tags == PORT_PRIORITY_TAGS_ALWAYS) &&
+ xvlan->v[i].tpid)) {
tci |= htons(VLAN_CFI);
flow->vlans[i].tpid = xvlan->v[i].tpid ?
htons(xvlan->v[i].tpid) :
}
memcpy(&old_vlans, &ctx->xin->flow.vlans, sizeof(old_vlans));
- xvlan_put(&ctx->xin->flow, &out_xvlan);
+ xvlan_put(&ctx->xin->flow, &out_xvlan, out_xbundle->use_priority_tags);
compose_output_action(ctx, xport->ofp_port, use_recirc ? &xr : NULL,
false, false);
enum port_priority_tags_mode {
PORT_PRIORITY_TAGS_NEVER = 0,
PORT_PRIORITY_TAGS_IF_NONZERO,
+ PORT_PRIORITY_TAGS_ALWAYS,
};
/* The behaviour of the port regarding priority tags */
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;
}
<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
</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>