projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dpif-linux: Use get_32aligned_u64() in an appropriate place.
[openvswitch]
/
datapath
/
vport-gre.c
diff --git
a/datapath/vport-gre.c
b/datapath/vport-gre.c
index 24c53f89680d4b46ee85f180fe8d197e692b3c88..8775d38c54dc16d14a2a67caa79cf33c444072e5 100644
(file)
--- a/
datapath/vport-gre.c
+++ b/
datapath/vport-gre.c
@@
-207,7
+207,7
@@
static void gre_err(struct sk_buff *skb, u32 info)
* out key as if it were the in key and then check to see if the input
* and output keys are the same.
*/
* out key as if it were the in key and then check to see if the input
* and output keys are the same.
*/
- if (mutable->in_key != mutable->out_key)
+ if (mutable->
key.
in_key != mutable->out_key)
return;
if (!!(mutable->flags & TNL_F_IN_KEY_MATCH) !=
return;
if (!!(mutable->flags & TNL_F_IN_KEY_MATCH) !=
@@
-389,7
+389,7
@@
static void gre_exit(void)
const struct vport_ops gre_vport_ops = {
.type = OVS_VPORT_TYPE_GRE,
const struct vport_ops gre_vport_ops = {
.type = OVS_VPORT_TYPE_GRE,
- .flags = VPORT_F_
GEN_STATS | VPORT_F_
TUN_ID,
+ .flags = VPORT_F_TUN_ID,
.init = gre_init,
.exit = gre_exit,
.create = gre_create,
.init = gre_init,
.exit = gre_exit,
.create = gre_create,