-#define LOG2_ETH_BUFFER_VLAN_2_DEEP LOG2_VLIB_BUFFER_FLAG_USER(3)
-#define LOG2_ETH_BUFFER_VLAN_1_DEEP LOG2_VLIB_BUFFER_FLAG_USER(4)
-#define ETH_BUFFER_VLAN_2_DEEP (1 << LOG2_ETH_BUFFER_VLAN_2_DEEP)
-#define ETH_BUFFER_VLAN_1_DEEP (1 << LOG2_ETH_BUFFER_VLAN_1_DEEP)
-#define ETH_BUFFER_VLAN_BITS (ETH_BUFFER_VLAN_1_DEEP | \
- ETH_BUFFER_VLAN_2_DEEP)
-
-#define LOG2_BUFFER_HANDOFF_NEXT_VALID LOG2_VLIB_BUFFER_FLAG_USER(6)
-#define BUFFER_HANDOFF_NEXT_VALID (1 << LOG2_BUFFER_HANDOFF_NEXT_VALID)
-
-#define LOG2_VNET_BUFFER_LOCALLY_ORIGINATED LOG2_VLIB_BUFFER_FLAG_USER(7)
-#define VNET_BUFFER_LOCALLY_ORIGINATED (1 << LOG2_VNET_BUFFER_LOCALLY_ORIGINATED)
+#define foreach_vnet_buffer_flag \
+ _( 1, L4_CHECKSUM_COMPUTED, "l4-cksum-computed") \
+ _( 2, L4_CHECKSUM_CORRECT, "l4-cksum-correct") \
+ _( 3, VLAN_2_DEEP, "vlan-2-deep") \
+ _( 4, VLAN_1_DEEP, "vlan-1-deep") \
+ _( 5, SPAN_CLONE, "span-clone") \
+ _( 6, LOOP_COUNTER_VALID, 0) \
+ _( 7, LOCALLY_ORIGINATED, "local") \
+ _( 8, IS_IP4, "ip4") \
+ _( 9, IS_IP6, "ip6") \
+ _(10, OFFLOAD_IP_CKSUM, "offload-ip-cksum") \
+ _(11, OFFLOAD_TCP_CKSUM, "offload-tcp-cksum") \
+ _(12, OFFLOAD_UDP_CKSUM, "offload-udp-cksum") \
+ _(13, IS_NATED, "nated") \
+ _(14, L2_HDR_OFFSET_VALID, 0) \
+ _(15, L3_HDR_OFFSET_VALID, 0) \
+ _(16, L4_HDR_OFFSET_VALID, 0) \
+ _(17, FLOW_REPORT, "flow-report") \
+ _(18, IS_DVR, "dvr") \
+ _(19, QOS_DATA_VALID, 0)
+
+#define VNET_BUFFER_FLAGS_VLAN_BITS \
+ (VNET_BUFFER_F_VLAN_1_DEEP | VNET_BUFFER_F_VLAN_2_DEEP)
+
+enum
+{
+#define _(bit, name, v) VNET_BUFFER_F_##name = (1 << LOG2_VLIB_BUFFER_FLAG_USER(bit)),
+ foreach_vnet_buffer_flag
+#undef _
+};