git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Match VLAN PCP and rewrite ToS bits (OpenFlow 0.9)
[sliver-openvswitch.git]
/
datapath
/
datapath.c
diff --git
a/datapath/datapath.c
b/datapath/datapath.c
index
2a8fb50
..
ea73f98
100644
(file)
--- a/
datapath/datapath.c
+++ b/
datapath/datapath.c
@@
-859,7
+859,6
@@
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;
error = -EFAULT;
if (copy_from_user(&uf, ufp, sizeof(struct odp_flow_put)))
goto error;
- uf.flow.key.reserved = 0;
table = rcu_dereference(dp->table);
flow = dp_table_lookup(table, &uf.flow.key);
table = rcu_dereference(dp->table);
flow = dp_table_lookup(table, &uf.flow.key);
@@
-1004,7
+1003,6
@@
static int del_flow(struct datapath *dp, struct odp_flow __user *ufp)
error = -EFAULT;
if (copy_from_user(&uf, ufp, sizeof uf))
goto error;
error = -EFAULT;
if (copy_from_user(&uf, ufp, sizeof uf))
goto error;
- uf.key.reserved = 0;
flow = dp_table_lookup(table, &uf.key);
error = -ENOENT;
flow = dp_table_lookup(table, &uf.key);
error = -ENOENT;
@@
-1040,7
+1038,6
@@
static int query_flows(struct datapath *dp, const struct odp_flowvec *flowvec)
if (__copy_from_user(&uf, ufp, sizeof uf))
return -EFAULT;
if (__copy_from_user(&uf, ufp, sizeof uf))
return -EFAULT;
- uf.key.reserved = 0;
flow = dp_table_lookup(table, &uf.key);
if (!flow)
flow = dp_table_lookup(table, &uf.key);
if (!flow)