aboutsummaryrefslogtreecommitdiff
path: root/datapath
diff options
context:
space:
mode:
authorIan Campbell <Ian.Campbell@citrix.com>2009-11-19 10:20:49 -0800
committerBen Pfaff <blp@nicira.com>2009-11-19 10:25:57 -0800
commitf7fed00035a1b7822c1d61e568bc31e842f192db (patch)
treecab89c9ecd842c39b555d20e31f9ff4aac13e494 /datapath
parente8cf6733e490cf78c1e5f5f58c3655011fb8ae22 (diff)
datapath: Use HAVE_PROTO_DATA_VALID when defining vswitch_skb_checksum_setup
The purpose of the non-empty variant of vswitch_skb_checksum_setup is to synchronise the proto_data_valid and proto_csum_blank fields into the standard skb csum/ip_summed fields, therefore it is more correct to key off of HAVE_PROTO_DATA_VALID. Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'datapath')
-rw-r--r--datapath/datapath.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/datapath/datapath.c b/datapath/datapath.c
index 4c397670..2a8fb503 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -574,7 +574,7 @@ static int dp_frame_hook(struct net_bridge_port *p, struct sk_buff **pskb)
#error
#endif
-#if defined(CONFIG_XEN) && LINUX_VERSION_CODE == KERNEL_VERSION(2,6,18)
+#if defined(CONFIG_XEN) && defined(HAVE_PROTO_DATA_VALID)
/* This code is copied verbatim from net/dev/core.c in Xen's
* linux-2.6.18-92.1.10.el5.xs5.0.0.394.644. We can't call those functions
* directly because they aren't exported. */