X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdatapath.c;h=34d2c9bc2bb1df13eea46a468870f8344ef90bd2;hb=ca00e5debfb9c2e4aa17eec9df563343c72d65ba;hp=6a3b9ec70e4a42b39387d7c96af929be6c851573;hpb=2ad2eb042517b975d761d456cceb5c9325c4aaa7;p=openvswitch

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 6a3b9ec7..34d2c9bc 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -81,7 +81,7 @@ struct datapath *get_dp(int dp_idx)
 }
 EXPORT_SYMBOL_GPL(get_dp);
 
-struct datapath *get_dp_locked(int dp_idx)
+static struct datapath *get_dp_locked(int dp_idx)
 {
 	struct datapath *dp;
 
@@ -176,7 +176,7 @@ static void release_dp(struct kobject *kobj)
 	kfree(dp);
 }
 
-struct kobj_type dp_ktype = {
+static struct kobj_type dp_ktype = {
 	.release = release_dp
 };
 
@@ -325,7 +325,7 @@ static void release_nbp(struct kobject *kobj)
 	kfree(p);
 }
 
-struct kobj_type brport_ktype = {
+static struct kobj_type brport_ktype = {
 #ifdef CONFIG_SYSFS
 	.sysfs_ops = &brport_sysfs_ops,
 #endif
@@ -423,7 +423,7 @@ got_port_no:
 	set_dp_devs_mtu(dp, dev);
 	dp_sysfs_add_if(dp->ports[port_no]);
 
-	err = __put_user(port_no, &port.port);
+	err = __put_user(port_no, &portp->port);
 
 out_put:
 	dev_put(dev);
@@ -670,7 +670,7 @@ out:
  * 4. CHECKSUM_UNNECESSARY (with proto_csum_blank true): This packet was
  *	generated locally by a Xen DomU and has a partial checksum.  If it is
  *	handled on this machine (Dom0 or DomU), then the checksum will not be
- *	computed.  If it goes off box, the checksum in the packet needs to
+ *	computed.  If it goes off box, the checksum in the packet needs to be
  *	completed.  Calling skb_checksum_setup converts this to CHECKSUM_HW
  *	(CHECKSUM_PARTIAL) so that the checksum can be completed.  In later
  *	kernels, this combination is replaced with CHECKSUM_PARTIAL.
@@ -940,7 +940,7 @@ static int put_flow(struct datapath *dp, struct odp_flow_put __user *ufp)
 	error = -EFAULT;
 	if (copy_from_user(&uf, ufp, sizeof(struct odp_flow_put)))
 		goto error;
-	uf.flow.key.reserved = 0;
+	memset(uf.flow.key.reserved, 0, sizeof uf.flow.key.reserved);
 
 	table = rcu_dereference(dp->table);
 	flow = dp_table_lookup(table, &uf.flow.key);
@@ -1085,7 +1085,7 @@ static int del_flow(struct datapath *dp, struct odp_flow __user *ufp)
 	error = -EFAULT;
 	if (copy_from_user(&uf, ufp, sizeof uf))
 		goto error;
-	uf.key.reserved = 0;
+	memset(uf.key.reserved, 0, sizeof uf.key.reserved);
 
 	flow = dp_table_lookup(table, &uf.key);
 	error = -ENOENT;
@@ -1121,7 +1121,7 @@ static int query_flows(struct datapath *dp, const struct odp_flowvec *flowvec)
 
 		if (__copy_from_user(&uf, ufp, sizeof uf))
 			return -EFAULT;
-		uf.key.reserved = 0;
+		memset(uf.key.reserved, 0, sizeof uf.key.reserved);
 
 		flow = dp_table_lookup(table, &uf.key);
 		if (!flow)