mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00
Code Issues Releases Wiki Activity

netdev-linux: Avoid depending on kernel definition of rtnl_link_stats64.

Browse Source 
We have to define our own with some kernel headers, so we might as well do
it everywhere, especially since there seems to be a problem with detecting
the presence of the definition with at least some kernels.

Reported-by: Wang Sheng-Hui <shhuiw@gmail.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Joe Stringer <joestringer@nicira.com>
This commit is contained in:
Ben Pfaff
2014-10-30 10:38:06 -07:00
parent 423ede182b
commit fa373af463
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/netdev-linux.c
View File

@@ -138,9 +138,17 @@ struct tpacket_auxdata {
uint16_t tp_vlan_tpid;
};
/* Linux 2.6.35 introduced IFLA_STATS64 and rtnl_link_stats64. */
#ifndef HAVE_STRUCT_RTNL_LINK_STATS64
/* Linux 2.6.35 introduced IFLA_STATS64 and rtnl_link_stats64.
*
* Tests for rtnl_link_stats64 don't seem to consistently work, e.g. on
* 2.6.32-431.29.2.el6.x86_64 (see report at
* http://openvswitch.org/pipermail/dev/2014-October/047978.html). Maybe
* if_link.h is not self-contained on those kernels. It is easiest to
* unconditionally define a replacement. */
#ifndef IFLA_STATS64
#define IFLA_STATS64 23
#endif
#define rtnl_link_stats64 rpl_rtnl_link_stats64
struct rtnl_link_stats64 {
uint64_t rx_packets;
uint64_t tx_packets;
@@ -169,7 +177,6 @@ struct rtnl_link_stats64 {
uint64_t rx_compressed;
uint64_t tx_compressed;
};
#endif /* !HAVE_STRUCT_RTNL_LINK_STATS64 */
enum {
VALID_IFINDEX = 1 << 0,