diff options
| author | Jesse Gross <jesse@nicira.com> | 2010-08-02 11:43:22 -0700 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2010-08-02 11:51:53 -0700 |
| commit | d43e8ef3f41160a8c45f96216faffb4afd957948 (patch) | |
| tree | e6eb031a7a9101513aa30b8dfae781e93aaed556 | |
| parent | 55cc89d6b427ca99dbc1217653033e6308318409 (diff) | |
| download | openvswitch-d43e8ef3f41160a8c45f96216faffb4afd957948.tar.gz | |
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.
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | datapath/linux-2.6/compat-2.6/include/linux/skbuff.h | 13 |
2 files changed, 0 insertions, 15 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index a0abdb53c..80794dac3 100644 --- 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 f9358b575..01a22d84b 100644 --- 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 |