diff options
| author | Patrick McHardy <kaber@trash.net> | 2013-04-01 11:44:59 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2013-04-01 11:44:59 +0200 |
| commit | d2b5cbd88ad9af1fc749b22f19dad9c15d6cbb85 (patch) | |
| tree | 8edc879632989f8a5ea1664f03e83f999c8e0efa /src/nl-addr-list.c | |
| parent | 94cd080452720149008a9c25a9364c5a4d3ccae7 (diff) | |
| parent | 6c9be5a31681ddf9a669ecf643092928ab0f2138 (diff) | |
Merge git://git.infradead.org/users/tgr/libnl
Signed-off-by: Patrick McHardy <kaber@trash.net>
Conflicts:
include/linux/netlink.h
lib/Makefile.am
lib/error.c
libnl-3.0.pc.in
src/Makefile.am
Diffstat (limited to 'src/nl-addr-list.c')
| -rw-r--r-- | src/nl-addr-list.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nl-addr-list.c b/src/nl-addr-list.c index 9b045a5..20995a8 100644 --- a/src/nl-addr-list.c +++ b/src/nl-addr-list.c @@ -41,7 +41,7 @@ static void print_usage(void) static char *prefix; -void print_prefix(struct nl_dump_params *p, int line) +static void print_prefix(struct nl_dump_params *p, int line) { if (prefix) nl_dump(p, "%s", prefix); @@ -65,7 +65,7 @@ static void env_dump(struct nl_object *obj, void *arg) nl_addr2str(rtnl_addr_get_local(addr), buf, sizeof(buf))); nl_dump_line(p, "%s_IFINDEX=%u\n", pfx, rtnl_addr_get_ifindex(addr)); - link_cache = nl_cache_mngt_require("route/link"); + link_cache = nl_cache_mngt_require_safe("route/link"); if (link_cache) nl_dump_line(p, "%s_IFNAME=%s\n", pfx, rtnl_link_i2name(link_cache, @@ -94,6 +94,9 @@ static void env_dump(struct nl_object *obj, void *arg) nl_dump_line(p, "%s_CACHEINFO_VALID=%u\n", pfx, rtnl_addr_get_valid_lifetime(addr)); + if (link_cache) + nl_cache_put(link_cache); + #if 0 if (addr->ce_mask & ADDR_ATTR_CACHEINFO) { struct rtnl_addr_cacheinfo *ci = &addr->a_cacheinfo; |