Patchwork [nftables,kernel,-,2/2] netfilter: nf_tables: Fix the netlink attributes policy for chain

login
register
mail settings
Submitter Tomasz Bursztyka
Date Oct. 7, 2013, 9:58 a.m.
Message ID <1381139880-20311-3-git-send-email-tomasz.bursztyka@linux.intel.com>
Download mbox | patch
Permalink /patch/281052/
State Accepted
Headers show

Comments

Tomasz Bursztyka - Oct. 7, 2013, 9:58 a.m.
- Reorder them as they appear in enum nft_chain_attributes
- Add NFTA_CHAIN_COUNTERS

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
---
 net/netfilter/nf_tables_api.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Pablo Neira - Oct. 11, 2013, 8:43 a.m.
On Mon, Oct 07, 2013 at 12:58:00PM +0300, Tomasz Bursztyka wrote:
> - Reorder them as they appear in enum nft_chain_attributes
> - Add NFTA_CHAIN_COUNTERS

Also applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 7cab11d..dcddc49 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -520,13 +520,14 @@  static struct nft_chain *nf_tables_chain_lookup(const struct nft_table *table,
 }
 
 static const struct nla_policy nft_chain_policy[NFTA_CHAIN_MAX + 1] = {
+	[NFTA_CHAIN_TABLE]	= { .type = NLA_STRING },
 	[NFTA_CHAIN_HANDLE]	= { .type = NLA_U64 },
 	[NFTA_CHAIN_NAME]	= { .type = NLA_STRING,
 				    .len = NFT_CHAIN_MAXNAMELEN - 1 },
-	[NFTA_CHAIN_TABLE]	= { .type = NLA_STRING },
 	[NFTA_CHAIN_HOOK]	= { .type = NLA_NESTED },
 	[NFTA_CHAIN_POLICY]	= { .type = NLA_U32 },
 	[NFTA_CHAIN_TYPE]	= { .type = NLA_NUL_STRING },
+	[NFTA_CHAIN_COUNTERS]	= { .type = NLA_NESTED },
 };
 
 static const struct nla_policy nft_hook_policy[NFTA_HOOK_MAX + 1] = {