X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdatapath.c;h=2a8fb503f443592e61bfd14398b4554e124842f4;hb=36775dad3505929f8370166c33e8e0f04ca96c1c;hp=6e97c345b288472a8af1714f18a5c3830ba58929;hpb=18fdbe16de40062c63f9119a6beef17602f4b233;p=openvswitch

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 6e97c345..2a8fb503 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -232,7 +232,7 @@ static int create_dp(int dp_idx, const char __user *devnamep)
 	if (!dp->table)
 		goto err_free_dp;
 
-	/* Setup our datapath device */
+	/* Set up our datapath device. */
 	dp_dev = dp_dev_create(dp, devname, ODPP_LOCAL);
 	err = PTR_ERR(dp_dev);
 	if (IS_ERR(dp_dev))
@@ -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. */
@@ -1021,7 +1021,7 @@ static int del_flow(struct datapath *dp, struct odp_flow __user *ufp)
 	 * we get completely accurate stats, but that blows our performance,
 	 * badly. */
 	dp->n_flows--;
-	error = answer_query(flow, uf.flags, ufp);
+	error = answer_query(flow, 0, ufp);
 	flow_deferred_free(flow);
 
 error:
@@ -1046,7 +1046,7 @@ static int query_flows(struct datapath *dp, const struct odp_flowvec *flowvec)
 		if (!flow)
 			error = __put_user(ENOENT, &ufp->stats.error);
 		else
-			error = answer_query(flow, 0, ufp);
+			error = answer_query(flow, uf.flags, ufp);
 		if (error)
 			return -EFAULT;
 	}
@@ -1167,9 +1167,9 @@ static int do_execute(struct datapath *dp, const struct odp_execute *executep)
 	skb_reset_mac_header(skb);
 	eth = eth_hdr(skb);
 
-    /* Normally, setting the skb 'protocol' field would be handled by a
-     * call to eth_type_trans(), but it assumes there's a sending
-     * device, which we may not have. */
+	/* Normally, setting the skb 'protocol' field would be handled by a
+	 * call to eth_type_trans(), but it assumes there's a sending
+	 * device, which we may not have. */
 	if (ntohs(eth->h_proto) >= 1536)
 		skb->protocol = eth->h_proto;
 	else