datapath-protocol: Include netlink.h.

On older kernels that don't have if_link.h, we use our own, limited
version.  This version doesn't include the netlink header, causing
problems where we were relying on it to define the types in
datapath-protocol.h.  Therefore, directly include it, since it is
better to be explicit about it anyways.

Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 6181a5d593bb9eb22d31bdc677a0d43f157136a4..4afc22b66d49cc1000c1698f52fc95c6a23e5330 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -12,6 +12,7 @@
  * 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
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)

diff --git a/include/openvswitch/datapath-protocol.h b/include/openvswitch/datapath-protocol.h
index ad68e9e11fb873a88c77547fd471c89855f56296..db135c8967cd8c47bbd94908953b90af0918c13d 100644 (file)
--- a/include/openvswitch/datapath-protocol.h
+++ b/include/openvswitch/datapath-protocol.h
@@ -68,6 +68,7 @@
 #endif
 
 #include <linux/if_link.h>
+#include <linux/netlink.h>
 
 #define ODP_MAX 256             /* Maximum number of datapaths. */