datapath: Backport consume_skb().

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

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 15acea9..b728c51 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
@@ -101,7 +101,7 @@ static inline struct rtable *skb_rtable(const struct sk_buff *skb)
 #endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17)
-/* Emulate Linux 2.6.17 and later behavior, in which kfree_skb silently ignores 
+/* Emulate Linux 2.6.17 and later behavior, in which kfree_skb silently ignores
  * null pointer arguments. */
 #define kfree_skb(skb) kfree_skb_maybe_null(skb)
 static inline void kfree_skb_maybe_null(struct sk_buff *skb)
@@ -228,17 +228,8 @@ static inline bool skb_warn_if_lro(const struct sk_buff *skb)
 #endif /* NETIF_F_LRO */
 #endif /* HAVE_SKB_WARN_LRO */
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
-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 /* kernel < 2.6.33 */
-
+#ifndef HAVE_CONSUME_SKB
+#define consume_skb kfree_skb
+#endif
 
 #endif