Merge branch 'mainstream'

[sliver-openvswitch.git] / datapath / linux / compat / include / linux / rtnetlink.h

diff --git a/datapath/linux/compat/include/linux/rtnetlink.h b/datapath/linux/compat/include/linux/rtnetlink.h
index 0a02149..a1b689c 100644 (file)
--- a/datapath/linux/compat/include/linux/rtnetlink.h
+++ b/datapath/linux/compat/include/linux/rtnetlink.h
@@ -3,49 +3,6 @@
 
 #include_next <linux/rtnetlink.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-static inline void rtnl_notify(struct sk_buff *skb, u32 pid, u32 group,
-                              struct nlmsghdr *nlh, gfp_t flags)
-{
-       BUG_ON(nlh != NULL);            /* not implemented */
-       if (group) {
-               /* errors reported via destination sk->sk_err */
-               nlmsg_multicast(rtnl, skb, 0, group, flags);
-       }
-}
-
-static inline void rtnl_set_sk_err(u32 group, int error)
-{
-       netlink_set_err(rtnl, 0, group, error);
-}
-#endif
-
-/* No 'net' parameter in these versions. */
-#define rtnl_notify(skb, net, pid, group, nlh, flags) \
-                   ((void) rtnl_notify(skb, pid, group, nlh, flags))
-#define rtnl_set_sk_err(net, group, error) \
-                       (rtnl_set_sk_err(group, error))
-#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
-/* Make the return type effectively 'void' to match Linux 2.6.30+. */
-#define rtnl_notify(skb, net, pid, group, nlh, flags) \
-       ((void) rtnl_notify(skb, net, pid, group, nlh, flags))
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
-static inline int rtnl_is_locked(void)
-{
-       if (unlikely(rtnl_trylock())) {
-               rtnl_unlock();
-               return 0;
-       }
-
-       return 1;
-}
-
-#endif
-
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34)
 #ifdef CONFIG_PROVE_LOCKING
 static inline int lockdep_rtnl_is_held(void)