From 28893376911ac7ed49f8db0504f3c105a821e7a8 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Wed, 31 Aug 2016 17:07:01 +0200 Subject: include: resync nf_tables.h cache copy Sync this with the kernel header file we currently have in tree. This patch addresses the compilation warning and breakage as result of this header update, specifically the "attibute" typo in trace and missing default case in expr/numgen.c. Signed-off-by: Pablo Neira Ayuso --- src/expr/numgen.c | 4 +++- src/trace.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/expr/numgen.c b/src/expr/numgen.c index 0669eda..7f2b425 100644 --- a/src/expr/numgen.c +++ b/src/expr/numgen.c @@ -23,7 +23,7 @@ struct nftnl_expr_ng { enum nft_registers dreg; unsigned int until; - enum nft_ng_type type; + enum nft_ng_types type; }; static int @@ -200,6 +200,8 @@ nftnl_expr_ng_snprintf_default(char *buf, size_t size, ng->until); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); break; + default: + break; } return offset; diff --git a/src/trace.c b/src/trace.c index 1a50390..2b3388d 100644 --- a/src/trace.c +++ b/src/trace.c @@ -79,7 +79,7 @@ bool nftnl_trace_is_set(const struct nftnl_trace *t, uint16_t attr) static int nftnl_trace_parse_attr_cb(const struct nlattr *attr, void *data) { const struct nlattr **tb = data; - enum nft_trace_attibutes type = mnl_attr_get_type(attr); + enum nft_trace_attributes type = mnl_attr_get_type(attr); if (mnl_attr_type_valid(attr, NFTA_TRACE_MAX) < 0) return MNL_CB_OK; -- cgit v1.2.3