stv0g/libnl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

veth: implement ->io_free

Browse source 
So that veth link can be just put by rtnl_link_put()

Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Cong Wang 2014-04-01 18:03:31 -07:00 • committed by Thomas Haller
parent 12bd035b05
commit 6c8f67b87a
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/route/link/veth.c
View file

@ -165,6 +165,18 @@ static int veth_alloc(struct rtnl_link *link)
return 0;
}
static void veth_free(struct rtnl_link *link)
{
struct rtnl_link *peer = rtnl_link_veth_get_peer(link);
if (peer) {
link->l_info = NULL;
/* avoid calling this recursively */
peer->l_info = NULL;
rtnl_link_put(peer);
}
/* the caller should finally free link */
}
static struct rtnl_link_info_ops veth_info_ops = {
.io_name = "veth",
.io_parse = veth_parse,
@ -175,6 +187,7 @@ static struct rtnl_link_info_ops veth_info_ops = {
.io_alloc = veth_alloc,
.io_clone = veth_clone,
.io_put_attrs = veth_put_attrs,
.io_free = veth_free,
};
/** @cond SKIP */
@ -228,8 +241,7 @@ struct rtnl_link *rtnl_link_veth_get_peer(struct rtnl_link *link)
*/
void rtnl_link_veth_release(struct rtnl_link *link)
{
struct rtnl_link *peer = rtnl_link_veth_get_peer(link);
rtnl_link_put(peer);
veth_free(link);
rtnl_link_put(link);
}
@ -276,9 +288,7 @@ int rtnl_link_veth_add(struct nl_sock *sock, const char *name,
rtnl_link_set_ns_pid(peer, pid);
err = rtnl_link_add(sock, link, NLM_F_CREATE);
rtnl_link_put(peer);
rtnl_link_put(link);
return err;
}