datapath: Fix build on Linux 2.6.18 through 2.6.28.

diff --git a/datapath/brcompat.c b/datapath/brcompat.c
index b64a2b8b464bd87812b27258eab826881f4a89f2..02a15b82e3ff3071da6a2c2242cb5ba26486833f 100644 (file)
--- a/datapath/brcompat.c
+++ b/datapath/brcompat.c
@@ -3,6 +3,7 @@
 #include <linux/completion.h>
 #include <linux/etherdevice.h>
 #include <linux/if_bridge.h>
+#include <linux/rculist.h>
 #include <linux/netdevice.h>
 #include <net/genetlink.h>
 

diff --git a/datapath/linux-2.6/compat-2.6/include/linux/rtnetlink.h b/datapath/linux-2.6/compat-2.6/include/linux/rtnetlink.h
index 449afde3cdbdfcd08e79594da83f21ccba525d37..8bc51560f12c5645b07083be541d44cf4877012a 100644 (file)
--- a/datapath/linux-2.6/compat-2.6/include/linux/rtnetlink.h
+++ b/datapath/linux-2.6/compat-2.6/include/linux/rtnetlink.h
@@ -19,6 +19,11 @@ static inline void rtnl_set_sk_err(struct net *net, u32 group, int error)
 {
        netlink_set_err(rtnl, 0, group, error);
 }
-#endif /* linux kernel < 2.6.19 */
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
+#define rtnl_notify(skb, net, pid, group, nlh, flags) \
+       ((void) (net), rtnl_notify(skb, pid, group, nlh, flags))
+#define rtnl_set_sk_err(net, group, error) \
+       ((void) (net), rtnl_set_sk_err(group, error))
+#endif /* linux kernel < 2.6.25 */
 
 #endif /* linux/rtnetlink.h wrapper */