netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 05/15] netfilter: nft_limit: rename to nft_limit_pkts
Date: Wed, 19 Aug 2015 21:18:21 +0200	[thread overview]
Message-ID: <1440011911-4359-6-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1440011911-4359-1-git-send-email-pablo@netfilter.org>

To prepare introduction of bytes ratelimit support.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 net/netfilter/nft_limit.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/net/netfilter/nft_limit.c b/net/netfilter/nft_limit.c
index 435c1cc..d0788e1 100644
--- a/net/netfilter/nft_limit.c
+++ b/net/netfilter/nft_limit.c
@@ -26,9 +26,9 @@ struct nft_limit {
 	unsigned long	stamp;
 };
 
-static void nft_limit_eval(const struct nft_expr *expr,
-			   struct nft_regs *regs,
-			   const struct nft_pktinfo *pkt)
+static void nft_limit_pkts_eval(const struct nft_expr *expr,
+				struct nft_regs *regs,
+				const struct nft_pktinfo *pkt)
 {
 	struct nft_limit *priv = nft_expr_priv(expr);
 
@@ -85,17 +85,17 @@ nla_put_failure:
 }
 
 static struct nft_expr_type nft_limit_type;
-static const struct nft_expr_ops nft_limit_ops = {
+static const struct nft_expr_ops nft_limit_pkts_ops = {
 	.type		= &nft_limit_type,
 	.size		= NFT_EXPR_SIZE(sizeof(struct nft_limit)),
-	.eval		= nft_limit_eval,
+	.eval		= nft_limit_pkts_eval,
 	.init		= nft_limit_init,
 	.dump		= nft_limit_dump,
 };
 
 static struct nft_expr_type nft_limit_type __read_mostly = {
 	.name		= "limit",
-	.ops		= &nft_limit_ops,
+	.ops		= &nft_limit_pkts_ops,
 	.policy		= nft_limit_policy,
 	.maxattr	= NFTA_LIMIT_MAX,
 	.flags		= NFT_EXPR_STATEFUL,
-- 
1.7.10.4

  parent reply	other threads:[~2015-08-19 19:18 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-19 19:18 [PATCH 00/15] Netfilter updates for net-next Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 01/15] netfilter: nft_counter: convert it to use per-cpu counters Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 02/15] netfilter: xt_TEE: get rid of WITH_CONNTRACK definition Pablo Neira Ayuso
2015-08-19 19:18 ` =?y?q?=5BPATCH=2003/15=5D=20netfilter=3A=20factor=20out=20packet=20duplication=20for=20IPv4/IPv6?= Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 04/15] netfilter: nf_tables: add nft_dup expression Pablo Neira Ayuso
2015-08-19 19:18 ` Pablo Neira Ayuso [this message]
2015-08-19 19:18 ` [PATCH 06/15] netfilter: nft_limit: convert to token-based limiting at nanosecond granularity Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 07/15] netfilter: nft_limit: factor out shared code with per-byte limiting Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 08/15] netfilter: nft_limit: add burst parameter Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 09/15] netfilter: nft_limit: constant token cost per packet Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 10/15] netfilter: nft_limit: add per-byte limiting Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 11/15] netfilter: nfacct: per network namespace support Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 12/15] netfilter: nf_conntrack: push zone object into functions Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 13/15] netfilter: nf_conntrack: add direction support for zones Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 14/15] netfilter: nf_conntrack: add efficient mark to zone mapping Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 15/15] netfilter: nft_payload: work around vlan header stripping Pablo Neira Ayuso
2015-08-20 21:48 ` [PATCH 00/15] Netfilter updates for net-next David Miller
  -- strict thread matches above, loose matches on Subject: below --
2015-08-21  4:32 Pablo Neira Ayuso
2015-08-21  4:32 ` [PATCH 05/15] netfilter: nft_limit: rename to nft_limit_pkts Pablo Neira Ayuso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1440011911-4359-6-git-send-email-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).