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
Merge commit '559eb2308b4d616590aba34bb8f4dd7f12ae4587'
[sliver-openvswitch.git]
/
datapath
/
vport-gre.c
diff --git
a/datapath/vport-gre.c
b/datapath/vport-gre.c
index
40b96cf
..
a29d2e8
100644
(file)
--- a/
datapath/vport-gre.c
+++ b/
datapath/vport-gre.c
@@
-331,7
+331,7
@@
static struct vport *gre_create(const struct vport_parms *parms)
struct vport *vport;
ovs_net = net_generic(net, ovs_net_id);
struct vport *vport;
ovs_net = net_generic(net, ovs_net_id);
- if (
rtn
l_dereference(ovs_net->vport_net.gre_vport))
+ if (
ovs
l_dereference(ovs_net->vport_net.gre_vport))
return ERR_PTR(-EEXIST);
vport = ovs_tnl_create(parms, &ovs_gre_vport_ops, &gre_tnl_ops);
return ERR_PTR(-EEXIST);
vport = ovs_tnl_create(parms, &ovs_gre_vport_ops, &gre_tnl_ops);
@@
-376,7
+376,7
@@
static struct vport *gre64_create(const struct vport_parms *parms)
struct vport *vport;
ovs_net = net_generic(net, ovs_net_id);
struct vport *vport;
ovs_net = net_generic(net, ovs_net_id);
- if (
rtn
l_dereference(ovs_net->vport_net.gre64_vport))
+ if (
ovs
l_dereference(ovs_net->vport_net.gre64_vport))
return ERR_PTR(-EEXIST);
vport = ovs_tnl_create(parms, &ovs_gre64_vport_ops, &gre64_tnl_ops);
return ERR_PTR(-EEXIST);
vport = ovs_tnl_create(parms, &ovs_gre64_vport_ops, &gre64_tnl_ops);