X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Flinux%2Fcompat%2Finclude%2Flinux%2Fskbuff.h;h=cc2bf0e1bf7612bf33a184fb3e5b7dd2904d9efd;hb=2c272bd98f619caf0b83ecf97addd94488a0c258;hp=de0c56ab9f86bf339981ef62b55757f8d09d331b;hpb=fd34f17610bf6d679e5606b081807e282980968c;p=sliver-openvswitch.git

diff --git a/datapath/linux/compat/include/linux/skbuff.h b/datapath/linux/compat/include/linux/skbuff.h
index de0c56ab9..cc2bf0e1b 100644
--- a/datapath/linux/compat/include/linux/skbuff.h
+++ b/datapath/linux/compat/include/linux/skbuff.h
@@ -243,6 +243,13 @@ static inline int skb_unclone(struct sk_buff *skb, gfp_t pri)
 }
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)
+static inline int skb_orphan_frags(struct sk_buff *skb, gfp_t gfp_mask)
+{
+	return 0;
+}
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0) */
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
 #define __skb_get_rxhash rpl__skb_get_rxhash
 #define skb_get_rxhash rpl_skb_get_rxhash
@@ -256,11 +263,16 @@ static inline __u32 skb_get_rxhash(struct sk_buff *skb)
 #endif
 	return __skb_get_rxhash(skb);
 }
-#endif
+
+static inline void skb_tx_error(struct sk_buff *skb)
+{
+	return;
+}
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) */
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0)
 unsigned int skb_zerocopy_headlen(const struct sk_buff *from);
-void skb_zerocopy(struct sk_buff *to, const struct sk_buff *from, int len, 
+int skb_zerocopy(struct sk_buff *to, struct sk_buff *from, int len,
 		  int hlen);
 #endif