datapath: Remove netdev_alloc_skb_ip_align() compat code.

We don't actually use this function anymore so there isn't a
point in having a configure test for it.

diff --git a/acinclude.m4 b/acinclude.m4
index a0abdb5..80794da 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -182,8 +182,6 @@ AC_DEFUN([OVS_CHECK_LINUX26_COMPAT], [
                   [OVS_DEFINE([HAVE_SKBUFF_HEADER_HELPERS])])
   OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_warn_if_lro],
                   [OVS_DEFINE([HAVE_SKB_WARN_LRO])])
-  OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [netdev_alloc_skb_ip_align],
-                  [OVS_DEFINE([HAVE_NETDEV_ALLOC_SKB_IP_ALIGN])])
 
   OVS_GREP_IFELSE([$KSRC26/include/linux/string.h $KSRC26/include/linux/slab.h],
                   [kmemdup], [OVS_DEFINE([HAVE_KMEMDUP])])

diff --git a/datapath/linux-2.6/compat-2.6/include/linux/skbuff.h b/datapath/linux-2.6/compat-2.6/include/linux/skbuff.h
index f9358b5..01a22d8 100644 (file)
--- a/datapath/linux-2.6/compat-2.6/include/linux/skbuff.h
+++ b/datapath/linux-2.6/compat-2.6/include/linux/skbuff.h
@@ -228,17 +228,4 @@ static inline bool skb_warn_if_lro(const struct sk_buff *skb)
 #endif /* NETIF_F_LRO */
 #endif /* HAVE_SKB_WARN_LRO */
 
-#ifndef HAVE_NETDEV_ALLOC_SKB_IP_ALIGN
-static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
-                                                       unsigned int length)
-{
-       struct sk_buff *skb = netdev_alloc_skb(dev, length + NET_IP_ALIGN);
-
-       if (NET_IP_ALIGN && skb)
-               skb_reserve(skb, NET_IP_ALIGN);
-       return skb;
-}
-#endif
-
-
 #endif