X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdatapath.c;h=1b5f57f8b2d67d19e2d8b01b7d7e673bd7d79445;hb=30746a1b6a9758a58d6f9a7a85830512aa0e114f;hp=aea8cc95c8bd8ac0f2a36f6143a319655ee29e51;hpb=5562d3ccd2073617fa2cb6a1384bbae0b5a08109;p=openvswitch

diff --git a/datapath/datapath.c b/datapath/datapath.c
index aea8cc95..1b5f57f8 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -236,7 +236,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))
@@ -978,13 +978,18 @@ static int put_actions(const struct sw_flow *flow, struct odp_flow __user *ufp)
 	return 0;
 }
 
-static int answer_query(struct sw_flow *flow, struct odp_flow __user *ufp)
+static int answer_query(struct sw_flow *flow, u32 query_flags,
+			struct odp_flow __user *ufp)
 {
 	struct odp_flow_stats stats;
 	unsigned long int flags;
 
 	spin_lock_irqsave(&flow->lock, flags);
 	get_stats(flow, &stats);
+
+	if (query_flags & ODPFF_ZERO_TCP_FLAGS) {
+		flow->tcp_flags = 0;
+	}
 	spin_unlock_irqrestore(&flow->lock, flags);
 
 	if (__copy_to_user(&ufp->stats, &stats, sizeof(struct odp_flow_stats)))
@@ -1022,10 +1027,10 @@ static int del_or_query_flow(struct datapath *dp,
 		 * to make sure that we get completely accurate stats, but that
 		 * blows our performance, badly. */
 		dp->n_flows--;
-		error = answer_query(flow, ufp);
+		error = answer_query(flow, 0, ufp);
 		flow_deferred_free(flow);
 	} else {
-		error = answer_query(flow, ufp);
+		error = answer_query(flow, uf.flags, ufp);
 	}
 
 error:
@@ -1051,7 +1056,7 @@ static int query_multiple_flows(struct datapath *dp,
 		if (!flow)
 			error = __clear_user(&ufp->stats, sizeof ufp->stats);
 		else
-			error = answer_query(flow, ufp);
+			error = answer_query(flow, 0, ufp);
 		if (error)
 			return -EFAULT;
 	}
@@ -1072,7 +1077,7 @@ static int list_flow(struct sw_flow *flow, void *cbdata_)
 
 	if (__copy_to_user(&ufp->key, &flow->key, sizeof flow->key))
 		return -EFAULT;
-	error = answer_query(flow, ufp);
+	error = answer_query(flow, 0, ufp);
 	if (error)
 		return error;