[ovs-dev] [PATCH v2 07/24] datapath: compat: Remove unnecessary iptunnel_xmit() declaration.

Pravin B Shelar pshelar at ovn.org
Thu Jun 30 08:06:24 UTC 2016


Signed-off-by: Pravin B Shelar <pshelar at ovn.org>
---
 datapath/linux/compat/include/net/ip_tunnels.h | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/datapath/linux/compat/include/net/ip_tunnels.h b/datapath/linux/compat/include/net/ip_tunnels.h
index cea75a1..b9fa76f 100644
--- a/datapath/linux/compat/include/net/ip_tunnels.h
+++ b/datapath/linux/compat/include/net/ip_tunnels.h
@@ -51,21 +51,11 @@ struct sk_buff *rpl_iptunnel_handle_offloads(struct sk_buff *skb,
 	iptunnel_handle_offloads(skb, gso_type_mask)
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0)
 #define iptunnel_xmit rpl_iptunnel_xmit
 int rpl_iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb,
 		      __be32 src, __be32 dst, __u8 proto, __u8 tos, __u8 ttl,
 		      __be16 df, bool xnet);
 
-#else
-
-#define rpl_iptunnel_xmit iptunnel_xmit
-int rpl_iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb,
-		      __be32 src, __be32 dst, __u8 proto, __u8 tos, __u8 ttl,
-		      __be16 df, bool xnet);
-
-#endif /* 3.18 */
-
 #ifndef TUNNEL_CSUM
 #define TUNNEL_CSUM	__cpu_to_be16(0x01)
 #define TUNNEL_ROUTING	__cpu_to_be16(0x02)
-- 
1.9.1




More information about the dev mailing list