From patchwork Thu Feb 23 11:10:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nevola X-Patchwork-Id: 731502 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vTWtB3xkDz9s7C for ; Thu, 23 Feb 2017 22:17:38 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EuCKPXy1"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751049AbdBWLRh (ORCPT ); Thu, 23 Feb 2017 06:17:37 -0500 Received: from mail-wr0-f196.google.com ([209.85.128.196]:33661 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750891AbdBWLRh (ORCPT ); Thu, 23 Feb 2017 06:17:37 -0500 Received: by mail-wr0-f196.google.com with SMTP id s27so3532818wrb.0 for ; Thu, 23 Feb 2017 03:17:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:subject:message-id:mime-version:content-disposition :user-agent; bh=1b9k2VYi0a0/Pqv3IUAvUlYv3aLkwvJ5X4B6ZgmDUPk=; b=EuCKPXy1wJX5lwz9oyNd3zfeVGiVdiigdYhnV9CmwOtWIu7GpmpJAYBz3q1lfNOpAL +GhlKOz6uWTZYdJdxibLL7BfwDYkJvJRFWWrNi8u+Ava2xHNNc/ztOr5KjsABcWXiDcw WLDJEK87S4hdGn3WmL0CvVvMbQqm4wXDTSrk8lJAChj2no8tGx6O1WseHp/p0T73sc/J ozg8OXZDE88v8gSpO9H0Wd+b+m5GanZWkFhxR8wTEMTmfBfFyrMtCbnJsV+J6S+lFhsS FFr/6ldufhcM3kt0d1/jAuofKIQ0e7gB4R+yTtvZoq5+C53LcVwP7M7YwkOx6/Z1y+4q WJYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:subject:message-id:mime-version :content-disposition:user-agent; bh=1b9k2VYi0a0/Pqv3IUAvUlYv3aLkwvJ5X4B6ZgmDUPk=; b=eYnM3VWDVHsuncCo1BeOJ7r36kz3RwQCoqE6K/lxqCFh+gdM8Y5y/3mYbR9kxwDcpl MjmU9yWAj/LfktbVN8vqjYi+JI2zX58Cca+Up2+bAJk6UrEdHq4U/2gm464uy2mDxnJw q0jqqN2DoTXVsZlSngvqEQNXkI0gE1JJFGF7GjlVThZHsWsW6A6RzcE2fpaBKnDbrJ1o PWVhwqlN9y1hV/i/Miy2/t/oB7nrxLVcv4vLDY2ZcDMMDAvhzTpB3QiyUV+x6nMtpv0i Zp2lg4IBR6dCH2G+jHT/my4BQyXYCBe8TNBlLyfm/Y4xDZ1K9m0advTHZlQPY8FfcSdU 0SAQ== X-Gm-Message-State: AMke39mCsL+4NPnxgpg27efkRwJL1oIKxUNMkdcVFEBL+CRdfsvXfIlzh5do5lBz8P4FQw== X-Received: by 10.223.161.133 with SMTP id u5mr22183450wru.152.1487848217544; Thu, 23 Feb 2017 03:10:17 -0800 (PST) Received: from nevthink ([91.126.73.162]) by smtp.gmail.com with ESMTPSA id m80sm5887093wmi.34.2017.02.23.03.10.16 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 Feb 2017 03:10:17 -0800 (PST) From: Laura Garcia Liebana X-Google-Original-From: Laura Garcia Liebana Date: Thu, 23 Feb 2017 12:10:15 +0100 To: netfilter-devel@vger.kernel.org Subject: [PATCH nf-next 1/2] netfilter: nft_hash: rename nft_hash to nft_jhash Message-ID: <20170223111015.573g4cxe7ehkev3y@nevthink> MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20170113 (1.7.2) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This patch renames the local nft_hash structure and functions to nft_jhash in order to prepare the nft_hash module code to add new hash functions. Signed-off-by: Laura Garcia Liebana --- net/netfilter/nft_hash.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/net/netfilter/nft_hash.c b/net/netfilter/nft_hash.c index eb2721af898d..ccb834ef049b 100644 --- a/net/netfilter/nft_hash.c +++ b/net/netfilter/nft_hash.c @@ -17,7 +17,7 @@ #include #include -struct nft_hash { +struct nft_jhash { enum nft_registers sreg:8; enum nft_registers dreg:8; u8 len; @@ -26,11 +26,11 @@ struct nft_hash { u32 offset; }; -static void nft_hash_eval(const struct nft_expr *expr, - struct nft_regs *regs, - const struct nft_pktinfo *pkt) +static void nft_jhash_eval(const struct nft_expr *expr, + struct nft_regs *regs, + const struct nft_pktinfo *pkt) { - struct nft_hash *priv = nft_expr_priv(expr); + struct nft_jhash *priv = nft_expr_priv(expr); const void *data = ®s->data[priv->sreg]; u32 h; @@ -47,11 +47,11 @@ static const struct nla_policy nft_hash_policy[NFTA_HASH_MAX + 1] = { [NFTA_HASH_OFFSET] = { .type = NLA_U32 }, }; -static int nft_hash_init(const struct nft_ctx *ctx, - const struct nft_expr *expr, - const struct nlattr * const tb[]) +static int nft_jhash_init(const struct nft_ctx *ctx, + const struct nft_expr *expr, + const struct nlattr * const tb[]) { - struct nft_hash *priv = nft_expr_priv(expr); + struct nft_jhash *priv = nft_expr_priv(expr); u32 len; int err; @@ -92,10 +92,10 @@ static int nft_hash_init(const struct nft_ctx *ctx, NFT_DATA_VALUE, sizeof(u32)); } -static int nft_hash_dump(struct sk_buff *skb, - const struct nft_expr *expr) +static int nft_jhash_dump(struct sk_buff *skb, + const struct nft_expr *expr) { - const struct nft_hash *priv = nft_expr_priv(expr); + const struct nft_jhash *priv = nft_expr_priv(expr); if (nft_dump_register(skb, NFTA_HASH_SREG, priv->sreg)) goto nla_put_failure; @@ -117,17 +117,17 @@ static int nft_hash_dump(struct sk_buff *skb, } static struct nft_expr_type nft_hash_type; -static const struct nft_expr_ops nft_hash_ops = { +static const struct nft_expr_ops nft_jhash_ops = { .type = &nft_hash_type, - .size = NFT_EXPR_SIZE(sizeof(struct nft_hash)), - .eval = nft_hash_eval, - .init = nft_hash_init, - .dump = nft_hash_dump, + .size = NFT_EXPR_SIZE(sizeof(struct nft_jhash)), + .eval = nft_jhash_eval, + .init = nft_jhash_init, + .dump = nft_jhash_dump, }; static struct nft_expr_type nft_hash_type __read_mostly = { .name = "hash", - .ops = &nft_hash_ops, + .ops = &nft_jhash_ops, .policy = nft_hash_policy, .maxattr = NFTA_HASH_MAX, .owner = THIS_MODULE,