datapath: Use HAVE_PROTO_DATA_VALID when defining vswitch_skb_checksum_setup
authorIan Campbell <Ian.Campbell@citrix.com>
Thu, 19 Nov 2009 18:20:49 +0000 (10:20 -0800)
committerBen Pfaff <blp@nicira.com>
Thu, 19 Nov 2009 18:25:57 +0000 (10:25 -0800)
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>
datapath/datapath.c

index 4c397670899ee32beae5b86bb8a9eb7f1e3e7a2e..2a8fb503f443592e61bfd14398b4554e124842f4 100644 (file)
@@ -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. */