X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fvnet%2Finterface.h;h=01d61afb5e865e7343c007463620779e4c854abf;hp=b34d19c55ef468fd6d781350fd682655cc9f1436;hb=5100aa9;hpb=6e36351faf5b69a0bfb8235b3b06f8b2c24e5547

diff --git a/src/vnet/interface.h b/src/vnet/interface.h
index b34d19c55ef..01d61afb5e8 100644
--- a/src/vnet/interface.h
+++ b/src/vnet/interface.h
@@ -69,7 +69,8 @@ typedef clib_error_t *(vnet_subif_add_del_function_t)
 
 /* Interface set mac address callback. */
 typedef clib_error_t *(vnet_interface_set_mac_address_function_t)
-  (struct vnet_hw_interface_t * hi, char *address);
+  (struct vnet_hw_interface_t * hi,
+   const u8 * old_address, const u8 * new_address);
 
 /* Interface set rx mode callback. */
 typedef clib_error_t *(vnet_interface_set_rx_mode_function_t)
@@ -89,7 +90,7 @@ typedef enum
   VNET_FLOW_DEV_OP_RESET_COUNTER,
 } vnet_flow_dev_op_t;
 
-/* Interface flow opeations callback. */
+/* Interface flow operations callback. */
 typedef int (vnet_flow_dev_ops_function_t) (struct vnet_main_t * vnm,
 					    vnet_flow_dev_op_t op,
 					    u32 hw_if_index, u32 index,
@@ -428,7 +429,7 @@ typedef struct _vnet_hw_interface_class
 			u32 sw_if_index,
 			vnet_link_t link_type, const void *dst_hw_address);
 
-  /* Update an adjacecny added by FIB (as opposed to via the
+  /* Update an adjacency added by FIB (as opposed to via the
    * neighbour resolution protocol). */
   void (*update_adjacency) (struct vnet_main_t * vnm,
 			    u32 sw_if_index, u32 adj_index);
@@ -481,57 +482,41 @@ static void __vnet_rm_hw_interface_class_registration_##x (void)        \
 }                                                                       \
 __VA_ARGS__ vnet_hw_interface_class_t x
 
-/* Hardware-interface.  This corresponds to a physical wire
-   that packets flow over. */
-typedef struct vnet_hw_interface_t
+typedef enum vnet_hw_interface_flags_t_
 {
-  /* Interface name. */
-  u8 *name;
-
-  u32 flags;
+  VNET_HW_INTERFACE_FLAG_NONE,
   /* Hardware link state is up. */
-#define VNET_HW_INTERFACE_FLAG_LINK_UP		(1 << 0)
+  VNET_HW_INTERFACE_FLAG_LINK_UP = (1 << 0),
   /* Hardware duplex state */
-#define VNET_HW_INTERFACE_FLAG_DUPLEX_SHIFT	1
-#define VNET_HW_INTERFACE_FLAG_HALF_DUPLEX	(1 << 1)
-#define VNET_HW_INTERFACE_FLAG_FULL_DUPLEX	(1 << 2)
+  VNET_HW_INTERFACE_FLAG_HALF_DUPLEX = (1 << 1),
+  VNET_HW_INTERFACE_FLAG_FULL_DUPLEX = (1 << 2),
+
+  /* rx mode flags */
+  VNET_HW_INTERFACE_FLAG_SUPPORTS_INT_MODE = (1 << 16),
+
+  /* tx checksum offload */
+  VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD = (1 << 17),
+} vnet_hw_interface_flags_t;
+
+#define VNET_HW_INTERFACE_FLAG_DUPLEX_SHIFT 1
+#define VNET_HW_INTERFACE_FLAG_SPEED_SHIFT  3
 #define VNET_HW_INTERFACE_FLAG_DUPLEX_MASK	\
   (VNET_HW_INTERFACE_FLAG_HALF_DUPLEX |		\
    VNET_HW_INTERFACE_FLAG_FULL_DUPLEX)
 
-  /* Hardware link speed */
-#define VNET_HW_INTERFACE_FLAG_SPEED_SHIFT	3
-#define VNET_HW_INTERFACE_FLAG_SPEED_10M	(1 << 3)
-#define VNET_HW_INTERFACE_FLAG_SPEED_100M	(1 << 4)
-#define VNET_HW_INTERFACE_FLAG_SPEED_1G		(1 << 5)
-#define VNET_HW_INTERFACE_FLAG_SPEED_2_5G	(1 << 6)
-#define VNET_HW_INTERFACE_FLAG_SPEED_5G		(1 << 7)
-#define VNET_HW_INTERFACE_FLAG_SPEED_10G	(1 << 8)
-#define VNET_HW_INTERFACE_FLAG_SPEED_20G	(1 << 9)
-#define VNET_HW_INTERFACE_FLAG_SPEED_25G	(1 << 10)
-#define VNET_HW_INTERFACE_FLAG_SPEED_40G	(1 << 11)
-#define VNET_HW_INTERFACE_FLAG_SPEED_50G	(1 << 12)
-#define VNET_HW_INTERFACE_FLAG_SPEED_56G	(1 << 13)
-#define VNET_HW_INTERFACE_FLAG_SPEED_100G	(1 << 14)
-#define VNET_HW_INTERFACE_FLAG_SPEED_MASK	\
-  (VNET_HW_INTERFACE_FLAG_SPEED_10M |		\
-   VNET_HW_INTERFACE_FLAG_SPEED_100M |		\
-   VNET_HW_INTERFACE_FLAG_SPEED_1G |		\
-   VNET_HW_INTERFACE_FLAG_SPEED_2_5G |		\
-   VNET_HW_INTERFACE_FLAG_SPEED_5G |		\
-   VNET_HW_INTERFACE_FLAG_SPEED_10G |		\
-   VNET_HW_INTERFACE_FLAG_SPEED_20G |		\
-   VNET_HW_INTERFACE_FLAG_SPEED_25G |		\
-   VNET_HW_INTERFACE_FLAG_SPEED_40G |		\
-   VNET_HW_INTERFACE_FLAG_SPEED_50G |		\
-   VNET_HW_INTERFACE_FLAG_SPEED_56G |		\
-   VNET_HW_INTERFACE_FLAG_SPEED_100G)
+/* Hardware-interface.  This corresponds to a physical wire
+   that packets flow over. */
+typedef struct vnet_hw_interface_t
+{
+  /* Interface name. */
+  u8 *name;
 
-  /* rx mode flags */
-#define VNET_HW_INTERFACE_FLAG_SUPPORTS_INT_MODE (1 << 16)
+  /* flags */
+  vnet_hw_interface_flags_t flags;
 
-  /* tx checksum offload */
-#define VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD (1 << 17)
+
+  /* link speed in kbps */
+  u32 link_speed;
 
   /* Hardware address as vector.  Zero (e.g. zero-length vector) if no
      address for this class (e.g. PPP). */
@@ -685,7 +670,8 @@ extern vnet_mtu_t vnet_link_to_mtu (vnet_link_t link);
 
 typedef enum vnet_sw_interface_flags_t_
 {
-  /* Interface is "up" meaning adminstratively up.
+  VNET_SW_INTERFACE_FLAG_NONE = 0,
+  /* Interface is "up" meaning administratively up.
      Up in the sense of link state being up is maintained by hardware interface. */
   VNET_SW_INTERFACE_FLAG_ADMIN_UP = (1 << 0),
 
@@ -871,7 +857,7 @@ static inline void
 vnet_interface_counter_lock (vnet_interface_main_t * im)
 {
   if (im->sw_if_counter_lock)
-    while (__sync_lock_test_and_set (im->sw_if_counter_lock, 1))
+    while (clib_atomic_test_and_set (im->sw_if_counter_lock))
       /* zzzz */ ;
 }
 
@@ -879,7 +865,7 @@ static inline void
 vnet_interface_counter_unlock (vnet_interface_main_t * im)
 {
   if (im->sw_if_counter_lock)
-    *im->sw_if_counter_lock = 0;
+    clib_atomic_release (im->sw_if_counter_lock);
 }
 
 void vnet_pcap_drop_trace_filter_add_del (u32 error_index, int is_add);