X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdatapath.c;h=ba363fb779f03a12bc37344ad8ddc3874b558446;hb=0b3f40f37183df18eb70255a9cc96d57d96b9a3e;hp=2a8fb503f443592e61bfd14398b4554e124842f4;hpb=f7fed00035a1b7822c1d61e568bc31e842f192db;p=openvswitch

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 2a8fb503..ba363fb7 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, 2009 Nicira Networks.
+ * Copyright (c) 2007, 2008, 2009, 2010 Nicira Networks.
  * Distributed under the terms of the GNU GPL version 2.
  *
  * Significant portions of this file may be copied from parts of the Linux
@@ -349,6 +349,7 @@ static int new_nbp(struct datapath *dp, struct net_device *dev, int port_no)
 	p->port_no = port_no;
 	p->dp = dp;
 	p->dev = dev;
+	atomic_set(&p->sflow_pool, 0);
 	if (!is_dp_dev(dev))
 		rcu_assign_pointer(dev->br_port, p);
 	else {
@@ -621,9 +622,7 @@ int vswitch_skb_checksum_setup(struct sk_buff *skb)
 out:
 	return -EPROTO;
 }
-#else
-int vswitch_skb_checksum_setup(struct sk_buff *skb) { return 0; }
-#endif /* CONFIG_XEN && linux == 2.6.18 */
+#endif /* CONFIG_XEN && HAVE_PROTO_DATA_VALID */
 
 /* Append each packet in 'skb' list to 'queue'.  There will be only one packet
  * unless we broke up a GSO packet. */
@@ -715,8 +714,7 @@ dp_output_control(struct datapath *dp, struct sk_buff *skb, int queue_no,
 	int err;
 
 	WARN_ON_ONCE(skb_shared(skb));
-	BUG_ON(queue_no != _ODPL_MISS_NR && queue_no != _ODPL_ACTION_NR);
-
+	BUG_ON(queue_no != _ODPL_MISS_NR && queue_no != _ODPL_ACTION_NR && queue_no != _ODPL_SFLOW_NR);
 	queue = &dp->queues[queue_no];
 	err = -ENOBUFS;
 	if (skb_queue_len(queue) >= DP_MAX_QUEUE_LEN)
@@ -1393,6 +1391,7 @@ static long openvswitch_ioctl(struct file *f, unsigned int cmd,
 	int dp_idx = iminor(f->f_dentry->d_inode);
 	struct datapath *dp;
 	int drop_frags, listeners, port_no;
+	unsigned int sflow_probability;
 	int err;
 
 	/* Handle commands with special locking requirements up front. */
@@ -1456,6 +1455,16 @@ static long openvswitch_ioctl(struct file *f, unsigned int cmd,
 		set_listen_mask(f, listeners);
 		break;
 
+	case ODP_GET_SFLOW_PROBABILITY:
+		err = put_user(dp->sflow_probability, (unsigned int __user *)argp);
+		break;
+
+	case ODP_SET_SFLOW_PROBABILITY:
+		err = get_user(sflow_probability, (unsigned int __user *)argp);
+		if (!err)
+			dp->sflow_probability = sflow_probability;
+		break;
+
 	case ODP_PORT_QUERY:
 		err = query_port(dp, (struct odp_port __user *)argp);
 		break;