diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/automake.mk | 1 | ||||
| -rw-r--r-- | include/linux/automake.mk | 2 | ||||
| -rw-r--r-- | include/linux/if_link.h | 56 | ||||
| -rw-r--r-- | include/openvswitch/datapath-protocol.h | 16 |
4 files changed, 13 insertions, 62 deletions
diff --git a/include/automake.mk b/include/automake.mk index f34e5c9bf..9ec5b72ed 100644 --- a/include/automake.mk +++ b/include/automake.mk @@ -1,4 +1,3 @@ -include include/linux/automake.mk include include/openflow/automake.mk include include/openvswitch/automake.mk include include/sparse/automake.mk diff --git a/include/linux/automake.mk b/include/linux/automake.mk deleted file mode 100644 index a0a963d09..000000000 --- a/include/linux/automake.mk +++ /dev/null @@ -1,2 +0,0 @@ -noinst_HEADERS += \ - include/linux/if_link.h diff --git a/include/linux/if_link.h b/include/linux/if_link.h deleted file mode 100644 index 55d99e46e..000000000 --- a/include/linux/if_link.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef __LINUX_IF_LINK_WRAPPER_H -#define __LINUX_IF_LINK_WRAPPER_H 1 - -#include <linux/version.h> - -#ifdef HAVE_RTNL_LINK_STATS64 -#include_next <linux/if_link.h> -#else /* !HAVE_RTNL_LINK_STATS64 */ - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) -#include_next <linux/if_link.h> -#else -/* Before 2.6.19 there was no <linux/if_link.h>. Instead all of the types now - * declared there were in <linux/if.h>. Unfortunately <linux/if.h> from 2.6.18 - * conflicts badly enough with <net/if.h> to break the userspace build. All - * we really need from <linux/if_link.h> is struct rtnl_link_stats64, which in - * turn only really needs __u64. */ -#include <linux/types.h> -#include <linux/netlink.h> -#endif /* kernel < 2.6.19 */ - -/* The main device statistics structure */ -struct rtnl_link_stats64 { - __u64 rx_packets; /* total packets received */ - __u64 tx_packets; /* total packets transmitted */ - __u64 rx_bytes; /* total bytes received */ - __u64 tx_bytes; /* total bytes transmitted */ - __u64 rx_errors; /* bad packets received */ - __u64 tx_errors; /* packet transmit problems */ - __u64 rx_dropped; /* no space in linux buffers */ - __u64 tx_dropped; /* no space available in linux */ - __u64 multicast; /* multicast packets received */ - __u64 collisions; - - /* detailed rx_errors: */ - __u64 rx_length_errors; - __u64 rx_over_errors; /* receiver ring buff overflow */ - __u64 rx_crc_errors; /* recved pkt with crc error */ - __u64 rx_frame_errors; /* recv'd frame alignment error */ - __u64 rx_fifo_errors; /* recv'r fifo overrun */ - __u64 rx_missed_errors; /* receiver missed packet */ - - /* detailed tx_errors */ - __u64 tx_aborted_errors; - __u64 tx_carrier_errors; - __u64 tx_fifo_errors; - __u64 tx_heartbeat_errors; - __u64 tx_window_errors; - - /* for cslip etc */ - __u64 rx_compressed; - __u64 tx_compressed; -}; -#endif /* !HAVE_RTNL_LINK_STATS64 */ - -#endif diff --git a/include/openvswitch/datapath-protocol.h b/include/openvswitch/datapath-protocol.h index 5687792df..8ed1c7f41 100644 --- a/include/openvswitch/datapath-protocol.h +++ b/include/openvswitch/datapath-protocol.h @@ -51,7 +51,6 @@ #include <sys/socket.h> #endif -#include <linux/if_link.h> #include <linux/netlink.h> /* datapaths. */ @@ -136,6 +135,17 @@ struct ovs_dp_stats { uint64_t n_flows; /* Number of flows present */ }; +struct ovs_vport_stats { + uint64_t rx_packets; /* total packets received */ + uint64_t tx_packets; /* total packets transmitted */ + uint64_t rx_bytes; /* total bytes received */ + uint64_t tx_bytes; /* total bytes transmitted */ + uint64_t rx_errors; /* bad packets received */ + uint64_t tx_errors; /* packet transmit problems */ + uint64_t rx_dropped; /* no space in linux buffers */ + int64_t tx_dropped; /* no space available in linux */ +}; + /* Logical ports. */ #define OVSP_LOCAL ((uint16_t)0) @@ -219,7 +229,7 @@ enum ovs_vport_cmd { * @OVS_VPORT_ATTR_NAME: Name of vport. For a vport based on a network device * this is the name of the network device. Maximum length %IFNAMSIZ-1 bytes * plus a null terminator. - * @OVS_VPORT_ATTR_STATS: A &struct rtnl_link_stats64 giving statistics for + * @OVS_VPORT_ATTR_STATS: A &struct ovs_vport_stats giving statistics for * packets sent or received through the vport. * @OVS_VPORT_ATTR_ADDRESS: A 6-byte Ethernet address for the vport. * @OVS_VPORT_ATTR_IFINDEX: ifindex of the underlying network device, if any. @@ -247,7 +257,7 @@ enum ovs_vport_attr { OVS_VPORT_ATTR_PORT_NO, /* port number within datapath */ OVS_VPORT_ATTR_TYPE, /* 32-bit OVS_VPORT_TYPE_* constant. */ OVS_VPORT_ATTR_NAME, /* string name, up to IFNAMSIZ bytes long */ - OVS_VPORT_ATTR_STATS, /* struct rtnl_link_stats64 */ + OVS_VPORT_ATTR_STATS, /* struct ovs_vport_stats */ OVS_VPORT_ATTR_ADDRESS, /* hardware address */ OVS_VPORT_ATTR_OPTIONS, /* nested attributes, varies by vport type */ OVS_VPORT_ATTR_IFINDEX, /* 32-bit ifindex of backing netdev */ |