nat: use correct data types for memory sizes

[vpp.git] / src / plugins / avf / virtchnl.h

diff --git a/src/plugins/avf/virtchnl.h b/src/plugins/avf/virtchnl.h
index 1bdecbc..1657c02 100644 (file)
--- a/src/plugins/avf/virtchnl.h
+++ b/src/plugins/avf/virtchnl.h
@@ -21,6 +21,16 @@
 #define VIRTCHNL_VERSION_MAJOR 1
 #define VIRTCHNL_VERSION_MINOR 1
 
+#define foreach_avf_promisc_flags \
+  _(0, UNICAST_PROMISC, "unicast") \
+  _(1, MULTICAST_PROMISC, "multicast")
+
+enum
+{
+#define _(a, b, c) FLAG_VF_ ##b = (1 << a),
+  foreach_avf_promisc_flags
+#undef _
+};
 
 #define AVFINT_DYN_CTLN(x)  (0x00003800 + (0x4 * x))
 #define AVFINT_ICR0         0x00004800
@@ -169,21 +179,28 @@ typedef struct
   virtchnl_vsi_resource_t vsi_res[1];
 } virtchnl_vf_resource_t;
 
+#define foreach_virtchnl_event_code \
+  _(0, UNKNOWN)                                \
+  _(1, LINK_CHANGE)                    \
+  _(2, RESET_IMPENDING)                        \
+  _(3, PF_DRIVER_CLOSE)
+
 typedef enum
 {
-  VIRTCHNL_EVENT_UNKNOWN = 0,
-  VIRTCHNL_EVENT_LINK_CHANGE,
-  VIRTCHNL_EVENT_RESET_IMPENDING,
-  VIRTCHNL_EVENT_PF_DRIVER_CLOSE,
+#define _(a,b) VIRTCHNL_EVENT_##b = (a),
+  foreach_virtchnl_event_code
+#undef _
 } virtchnl_event_codes_t;
 
 #define foreach_virtchnl_link_speed \
+  _(0, 2_5GB, "2.5 Gbps")              \
   _(1, 100MB, "100 Mbps")              \
   _(2, 1GB, "1 Gbps")                  \
   _(3, 10GB, "10 Gbps")                        \
   _(4, 40GB, "40 Gbps")                        \
   _(5, 20GB, "20 Gbps")                        \
-  _(6, 25GB, "25 Gbps")
+  _(6, 25GB, "25 Gbps")                        \
+  _(7, 5GB, "5 Gbps")
 
 typedef enum
 {