X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface.h;h=f6f486e4591286bcb8ac35ccd7a8d93c4235189a;hb=ad9d528;hp=5c15d29f4531b15f7dbe9384f0822f7961660b7d;hpb=6e43e0680fc21c6a986289cec4406c3624d3bbe6;p=vpp.git

diff --git a/src/vnet/interface.h b/src/vnet/interface.h
index 5c15d29f453..f6f486e4591 100644
--- a/src/vnet/interface.h
+++ b/src/vnet/interface.h
@@ -40,7 +40,8 @@
 #ifndef included_vnet_interface_h
 #define included_vnet_interface_h
 
-#include <vnet/unix/pcap.h>
+#include <vlib/vlib.h>
+#include <vppinfra/pcap.h>
 #include <vnet/l3_types.h>
 
 struct vnet_main_t;
@@ -484,26 +485,13 @@ __VA_ARGS__ vnet_hw_interface_class_t x
 
 typedef enum vnet_hw_interface_flags_t_
 {
+  VNET_HW_INTERFACE_FLAG_NONE,
   /* Hardware link state is up. */
   VNET_HW_INTERFACE_FLAG_LINK_UP = (1 << 0),
   /* Hardware duplex state */
   VNET_HW_INTERFACE_FLAG_HALF_DUPLEX = (1 << 1),
   VNET_HW_INTERFACE_FLAG_FULL_DUPLEX = (1 << 2),
 
-  /* Hardware link speed */
-  VNET_HW_INTERFACE_FLAG_SPEED_10M = (1 << 3),
-  VNET_HW_INTERFACE_FLAG_SPEED_100M = (1 << 4),
-  VNET_HW_INTERFACE_FLAG_SPEED_1G = (1 << 5),
-  VNET_HW_INTERFACE_FLAG_SPEED_2_5G = (1 << 6),
-  VNET_HW_INTERFACE_FLAG_SPEED_5G = (1 << 7),
-  VNET_HW_INTERFACE_FLAG_SPEED_10G = (1 << 8),
-  VNET_HW_INTERFACE_FLAG_SPEED_20G = (1 << 9),
-  VNET_HW_INTERFACE_FLAG_SPEED_25G = (1 << 10),
-  VNET_HW_INTERFACE_FLAG_SPEED_40G = (1 << 11),
-  VNET_HW_INTERFACE_FLAG_SPEED_50G = (1 << 12),
-  VNET_HW_INTERFACE_FLAG_SPEED_56G = (1 << 13),
-  VNET_HW_INTERFACE_FLAG_SPEED_100G = (1 << 14),
-
   /* rx mode flags */
   VNET_HW_INTERFACE_FLAG_SUPPORTS_INT_MODE = (1 << 16),
 
@@ -516,19 +504,6 @@ typedef enum vnet_hw_interface_flags_t_
 #define VNET_HW_INTERFACE_FLAG_DUPLEX_MASK	\
   (VNET_HW_INTERFACE_FLAG_HALF_DUPLEX |		\
    VNET_HW_INTERFACE_FLAG_FULL_DUPLEX)
-#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. */
@@ -540,6 +515,10 @@ typedef struct vnet_hw_interface_t
   /* flags */
   vnet_hw_interface_flags_t flags;
 
+
+  /* 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). */
   u8 *hw_address;
@@ -692,7 +671,7 @@ extern vnet_mtu_t vnet_link_to_mtu (vnet_link_t link);
 
 typedef enum vnet_sw_interface_flags_t_
 {
-  VNET_SW_INTERFACE_FLAG_ADMIN_NONE = 0,
+  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),
@@ -737,8 +716,6 @@ typedef struct
   /* this swif is unnumbered, use addresses on unnumbered_sw_if_index... */
   u32 unnumbered_sw_if_index;
 
-  u32 link_speed;
-
   /* VNET_SW_INTERFACE_TYPE_HARDWARE. */
   u32 hw_if_index;