Merge branch 'mainstream'

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

diff --git a/datapath/linux/compat/include/linux/skbuff.h b/datapath/linux/compat/include/linux/skbuff.h
index 65336ca..de0c56a 100644 (file)
--- a/datapath/linux/compat/include/linux/skbuff.h
+++ b/datapath/linux/compat/include/linux/skbuff.h
@@ -265,17 +265,17 @@ void skb_zerocopy(struct sk_buff *to, const struct sk_buff *from, int len,
 #endif
 
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+#ifndef HAVE_SKB_HAS_FRAG_LIST
 #define skb_has_frag_list skb_has_frags
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
+#ifndef HAVE___SKB_FILL_PAGE_DESC
 static inline void __skb_fill_page_desc(struct sk_buff *skb, int i,
                                        struct page *page, int off, int size)
 {
        skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
 
-       frag->page.p            = page;
+       __skb_frag_set_page(frag, page);
        frag->page_offset       = off;
        skb_frag_size_set(frag, size);
 }