diff options
| author | Jesse Gross <jesse@nicira.com> | 2010-05-06 12:31:43 -0700 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2010-05-06 13:15:21 -0700 |
| commit | 14cf356bf27c3c7e52a1f8fe3d7f0ffcb19af7fb (patch) | |
| tree | 7c922eff477a12f47107e26447677f6e5466dae8 | |
| parent | 30ea5d93dc1258c59e3ebbe090169cd3bf9ef078 (diff) | |
| download | openvswitch-14cf356bf27c3c7e52a1f8fe3d7f0ffcb19af7fb.tar.gz | |
datapath: Add configure test for skb_warn_if_lro().
Some distributions backport this function, so use a configure
test instead of a version check.
CC: Alexey I. Froloff <raorn@altlinux.org>
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | datapath/linux-2.6/compat-2.6/dev-openvswitch.c | 8 | ||||
| -rw-r--r-- | datapath/linux-2.6/compat-2.6/include/linux/skbuff.h | 9 | ||||
| -rw-r--r-- | datapath/linux-2.6/compat-2.6/skbuff-openvswitch.c | 5 |
4 files changed, 10 insertions, 14 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 64384d90f..e52a884de 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -164,6 +164,8 @@ AC_DEFUN([OVS_CHECK_LINUX26_COMPAT], [ [OVS_DEFINE([HAVE_IPV4_IS_MULTICAST])]) OVS_GREP_IFELSE([$KSRC26/include/linux/string.h $KSRC26/include/linux/slab.h], [kmemdup], [OVS_DEFINE([HAVE_KMEMDUP])]) + OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_warn_if_lro], + [OVS_DEFINE([HAVE_SKB_WARN_LRO])]) # Check for the proto_data_valid member in struct sk_buff. The [^@] # is necessary because some versions of this header remove the # member but retain the kerneldoc comment that describes it (which diff --git a/datapath/linux-2.6/compat-2.6/dev-openvswitch.c b/datapath/linux-2.6/compat-2.6/dev-openvswitch.c index 7be33f6e7..180b72a47 100644 --- a/datapath/linux-2.6/compat-2.6/dev-openvswitch.c +++ b/datapath/linux-2.6/compat-2.6/dev-openvswitch.c @@ -1,12 +1,8 @@ -#include <linux/version.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) +#ifndef HAVE_SKB_WARN_LRO #include <linux/netdevice.h> #ifndef NETIF_F_LRO -void dev_disable_lro(struct net_device *dev) { } -#else - #include <linux/ethtool.h> /** @@ -32,4 +28,4 @@ void dev_disable_lro(struct net_device *dev) #endif /* NETIF_F_LRO */ -#endif /* kernel < 2.6.27 */ +#endif /* HAVE_SKB_WARN_LRO */ 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 6a6b0950b..e8dc72ecd 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 @@ -205,16 +205,15 @@ static inline struct sk_buff *skb_gso_segment(struct sk_buff *skb, } #endif /* before 2.6.18 */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) - -extern void __skb_warn_lro_forwarding(const struct sk_buff *skb); - +#ifndef HAVE_SKB_WARN_LRO #ifndef NETIF_F_LRO static inline bool skb_warn_if_lro(const struct sk_buff *skb) { return false; } #else +extern void __skb_warn_lro_forwarding(const struct sk_buff *skb); + static inline bool skb_warn_if_lro(const struct sk_buff *skb) { /* LRO sets gso_size but not gso_type, whereas if GSO is really @@ -227,7 +226,7 @@ static inline bool skb_warn_if_lro(const struct sk_buff *skb) return false; } #endif /* NETIF_F_LRO */ -#endif /* kernel < 2.6.27 */ +#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, diff --git a/datapath/linux-2.6/compat-2.6/skbuff-openvswitch.c b/datapath/linux-2.6/compat-2.6/skbuff-openvswitch.c index a9743adc5..799170653 100644 --- a/datapath/linux-2.6/compat-2.6/skbuff-openvswitch.c +++ b/datapath/linux-2.6/compat-2.6/skbuff-openvswitch.c @@ -1,5 +1,4 @@ -#include <linux/version.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) +#ifndef HAVE_SKB_WARN_LRO #include <linux/netdevice.h> @@ -10,4 +9,4 @@ void __skb_warn_lro_forwarding(const struct sk_buff *skb) " while LRO is enabled\n", skb->dev->name); } -#endif /* kernel < 2.6.27 */ +#endif /* HAVE_SKB_WARN_LRO */ |