summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2018-09-28 14:55:56 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2018-10-04 02:13:58 +0200
commit0562beb6544d3fdb897870a10d9925eab40ac73a (patch)
tree04726048100cf722357e826479fdd7dc87724648 /src
parent276c452e47c5e22b3af06a051aa2908521aeba66 (diff)
src: get rid of netlink_genid_get()
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
-rw-r--r--src/netlink.c5
-rw-r--r--src/rule.c5
2 files changed, 3 insertions, 7 deletions
diff --git a/src/netlink.c b/src/netlink.c
index 7639847b..f40678f8 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -79,11 +79,6 @@ void netlink_restart(struct mnl_socket *nf_sock)
nf_sock = netlink_open_sock();
}
-uint16_t netlink_genid_get(struct netlink_ctx *ctx)
-{
- return mnl_genid_get(ctx);
-}
-
void __noreturn __netlink_abi_error(const char *file, int line,
const char *reason)
{
diff --git a/src/rule.c b/src/rule.c
index 6d027c26..32b13b19 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -235,7 +235,7 @@ int cache_update(struct mnl_socket *nf_sock, struct nft_cache *cache,
replay:
ctx.seqnum = cache->seqnum++;
- genid = netlink_genid_get(&ctx);
+ genid = mnl_genid_get(&ctx);
if (genid && genid == cache->genid)
return 0;
if (cache->genid)
@@ -278,7 +278,7 @@ void cache_flush(struct mnl_socket *nf_sock, struct nft_cache *cache,
};
__cache_flush(&cache->list);
- cache->genid = netlink_genid_get(&ctx);
+ cache->genid = mnl_genid_get(&ctx);
}
void cache_release(struct nft_cache *cache)
@@ -1341,6 +1341,7 @@ void cmd_free(struct cmd *cmd)
}
#include <netlink.h>
+#include <mnl.h>
static int __do_add_setelems(struct netlink_ctx *ctx, const struct handle *h,
struct set *set, struct expr *expr, uint32_t flags)