diff options
author | Patrick McHardy | 2015-04-11 03:27:29 +0200 |
---|---|---|
committer | Pablo Neira Ayuso | 2015-04-13 16:25:50 +0200 |
commit | 27e6d2017abdfbdb8b790c34c93d65ee10ce2fc5 (patch) | |
tree | f6565eb45fba1427368254fe4d29e708082cf5ce /net/netfilter/nft_byteorder.c | |
parent | netfilter: nft_lookup: use nft_validate_register_store() to validate types (diff) | |
download | kernel-qcow2-linux-27e6d2017abdfbdb8b790c34c93d65ee10ce2fc5.tar.gz kernel-qcow2-linux-27e6d2017abdfbdb8b790c34c93d65ee10ce2fc5.tar.xz kernel-qcow2-linux-27e6d2017abdfbdb8b790c34c93d65ee10ce2fc5.zip |
netfilter: nf_tables: kill nft_validate_output_register()
All users of nft_validate_register_store() first invoke
nft_validate_output_register(). There is in fact no use for using it
on its own, so simplify the code by folding the functionality into
nft_validate_register_store() and kill it.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nft_byteorder.c')
-rw-r--r-- | net/netfilter/nft_byteorder.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/net/netfilter/nft_byteorder.c b/net/netfilter/nft_byteorder.c index 03bfb7598395..848bce032350 100644 --- a/net/netfilter/nft_byteorder.c +++ b/net/netfilter/nft_byteorder.c @@ -115,15 +115,8 @@ static int nft_byteorder_init(const struct nft_ctx *ctx, return err; priv->dreg = ntohl(nla_get_be32(tb[NFTA_BYTEORDER_DREG])); - err = nft_validate_output_register(priv->dreg); - if (err < 0) - return err; - err = nft_validate_register_store(ctx, priv->dreg, NULL, - NFT_DATA_VALUE, priv->len); - if (err < 0) - return err; - - return 0; + return nft_validate_register_store(ctx, priv->dreg, NULL, + NFT_DATA_VALUE, priv->len); } static int nft_byteorder_dump(struct sk_buff *skb, const struct nft_expr *expr) |