projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xenserver: Remove other_config option for setting controller.
[openvswitch]
/
include
/
linux
/
if_link.h
diff --git
a/include/linux/if_link.h
b/include/linux/if_link.h
index 4afc22b66d49cc1000c1698f52fc95c6a23e5330..55d99e46ea81340d25cd855a7a84201ef4f8fa1a 100644
(file)
--- a/
include/linux/if_link.h
+++ b/
include/linux/if_link.h
@@
-3,6
+3,10
@@
#include <linux/version.h>
#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
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
#include_next <linux/if_link.h>
#else
@@
-13,9
+17,8
@@
* turn only really needs __u64. */
#include <linux/types.h>
#include <linux/netlink.h>
* turn only really needs __u64. */
#include <linux/types.h>
#include <linux/netlink.h>
-#endif
+#endif
/* kernel < 2.6.19 */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
/* The main device statistics structure */
struct rtnl_link_stats64 {
__u64 rx_packets; /* total packets received */
/* The main device statistics structure */
struct rtnl_link_stats64 {
__u64 rx_packets; /* total packets received */
@@
-48,6
+51,6
@@
struct rtnl_link_stats64 {
__u64 rx_compressed;
__u64 tx_compressed;
};
__u64 rx_compressed;
__u64 tx_compressed;
};
-#endif /*
linux kernel < 2.6.35
*/
+#endif /*
!HAVE_RTNL_LINK_STATS64
*/
#endif
#endif