Merge "master" into "wdp".

[sliver-openvswitch.git] / datapath / linux-2.6 / compat-2.6 / include / linux / if_vlan.h

diff --git a/datapath/linux-2.6/compat-2.6/include/linux/if_vlan.h b/datapath/linux-2.6/compat-2.6/include/linux/if_vlan.h
index 8bc4ac5..0d70c55 100644 (file)
--- a/datapath/linux-2.6/compat-2.6/include/linux/if_vlan.h
+++ b/datapath/linux-2.6/compat-2.6/include/linux/if_vlan.h
@@ -4,6 +4,15 @@
 #include_next <linux/if_vlan.h>
 #include <linux/skbuff.h>
 
+/* All of these were introduced in a single commit preceding 2.6.33, so
+ * presumably all of them or none of them are present. */
+#ifndef VLAN_PRIO_MASK
+#define VLAN_PRIO_MASK         0xe000 /* Priority Code Point */
+#define VLAN_PRIO_SHIFT                13
+#define VLAN_CFI_MASK          0x1000 /* Canonical Format Indicator */
+#define VLAN_TAG_PRESENT       VLAN_CFI_MASK
+#endif
+
 /*
  * The behavior of __vlan_put_tag() has changed over time:
  *