projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'drm-vc4-fixes-2016-09-14' of https://github.com/anholt/linux into drm...
[linux-2.6-block.git]
/
net
/
openvswitch
/
vport-geneve.c
diff --git
a/net/openvswitch/vport-geneve.c
b/net/openvswitch/vport-geneve.c
index 1a1fcec8869593a8c99710e2021baa45ebfdedc8..5aaf3babfc3fa0bf70b8a72ebd95c40962dd6ea2 100644
(file)
--- a/
net/openvswitch/vport-geneve.c
+++ b/
net/openvswitch/vport-geneve.c
@@
-93,7
+93,14
@@
static struct vport *geneve_tnl_create(const struct vport_parms *parms)
return ERR_CAST(dev);
}
return ERR_CAST(dev);
}
- dev_change_flags(dev, dev->flags | IFF_UP);
+ err = dev_change_flags(dev, dev->flags | IFF_UP);
+ if (err < 0) {
+ rtnl_delete_link(dev);
+ rtnl_unlock();
+ ovs_vport_free(vport);
+ goto error;
+ }
+
rtnl_unlock();
return vport;
error:
rtnl_unlock();
return vport;
error: