{"id":809820,"url":"http://patchwork.ozlabs.org/api/1.2/patches/809820/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1504555874-4168-4-git-send-email-pablo@netfilter.org/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504555874-4168-4-git-send-email-pablo@netfilter.org>","list_archive_url":null,"date":"2017-09-04T20:11:05","name":"[03/12] netfilter: nft_limit: replace pkt_bytes with bytes","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"d5a6961006fac0c147724b6af18ef3a21e29273b","submitter":{"id":1315,"url":"http://patchwork.ozlabs.org/api/1.2/people/1315/?format=json","name":"Pablo Neira Ayuso","email":"pablo@netfilter.org"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1504555874-4168-4-git-send-email-pablo@netfilter.org/mbox/","series":[{"id":1451,"url":"http://patchwork.ozlabs.org/api/1.2/series/1451/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=1451","date":"2017-09-04T20:11:02","name":"[01/12] netfilter: xt_hashlimit: add rate match mode","version":1,"mbox":"http://patchwork.ozlabs.org/series/1451/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/809820/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809820/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xmLcg10Tlz9t2R\n\tfor ;\n\tTue, 5 Sep 2017 06:12:51 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754472AbdIDUMs (ORCPT );\n\tMon, 4 Sep 2017 16:12:48 -0400","from mail.us.es ([193.147.175.20]:42150 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1754674AbdIDUL3 (ORCPT );\n\tMon, 4 Sep 2017 16:11:29 -0400","from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id 6C6E1532F8F\n\tfor ; Mon, 4 Sep 2017 22:10:59 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 5F552B5026\n\tfor ; Mon, 4 Sep 2017 22:10:59 +0200 (CEST)","by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid 54D1635BA; Mon, 4 Sep 2017 22:10:59 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 35488B5028;\n\tMon, 4 Sep 2017 22:10:57 +0200 (CEST)","from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int\n\t(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); \n\tMon, 04 Sep 2017 22:10:57 +0200 (CEST)","from salvia.here (129.166.216.87.static.jazztel.es\n\t[87.216.166.129]) (Authenticated sender: pneira@us.es)\n\tby entrada.int (Postfix) with ESMTPA id CE5304265A22;\n\tMon, 4 Sep 2017 22:10:56 +0200 (CEST)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.1 (2015-04-28) on\n\tantivirus1-rhel7.int","X-Spam-Level":"","X-Spam-Status":"No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50,\n\tSMTPAUTH_US2,USER_IN_WHITELIST autolearn=disabled version=3.4.1","X-Virus-Status":"clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int)","X-SMTPAUTHUS":"auth mail.us.es","From":"Pablo Neira Ayuso ","To":"netfilter-devel@vger.kernel.org","Cc":"davem@davemloft.net, netdev@vger.kernel.org","Subject":"[PATCH 03/12] netfilter: nft_limit: replace pkt_bytes with bytes","Date":"Mon, 4 Sep 2017 22:11:05 +0200","Message-Id":"<1504555874-4168-4-git-send-email-pablo@netfilter.org>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1504555874-4168-1-git-send-email-pablo@netfilter.org>","References":"<1504555874-4168-1-git-send-email-pablo@netfilter.org>","X-Virus-Scanned":"ClamAV using ClamSMTP","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: \"Pablo M. Bermudo Garay\" \n\nJust a small refactor patch in order to improve the code readability.\n\nSigned-off-by: Pablo M. Bermudo Garay \nSigned-off-by: Pablo Neira Ayuso \n---\n net/netfilter/nft_limit.c | 26 +++++++++++++-------------\n 1 file changed, 13 insertions(+), 13 deletions(-)","diff":"diff --git a/net/netfilter/nft_limit.c b/net/netfilter/nft_limit.c\nindex 14538b1d4d11..aae2d1ec27f3 100644\n--- a/net/netfilter/nft_limit.c\n+++ b/net/netfilter/nft_limit.c\n@@ -168,9 +168,9 @@ static const struct nft_expr_ops nft_limit_pkts_ops = {\n \t.dump\t\t= nft_limit_pkts_dump,\n };\n \n-static void nft_limit_pkt_bytes_eval(const struct nft_expr *expr,\n-\t\t\t\t struct nft_regs *regs,\n-\t\t\t\t const struct nft_pktinfo *pkt)\n+static void nft_limit_bytes_eval(const struct nft_expr *expr,\n+\t\t\t\t struct nft_regs *regs,\n+\t\t\t\t const struct nft_pktinfo *pkt)\n {\n \tstruct nft_limit *priv = nft_expr_priv(expr);\n \tu64 cost = div64_u64(priv->nsecs * pkt->skb->len, priv->rate);\n@@ -179,29 +179,29 @@ static void nft_limit_pkt_bytes_eval(const struct nft_expr *expr,\n \t\tregs->verdict.code = NFT_BREAK;\n }\n \n-static int nft_limit_pkt_bytes_init(const struct nft_ctx *ctx,\n-\t\t\t\t const struct nft_expr *expr,\n-\t\t\t\t const struct nlattr * const tb[])\n+static int nft_limit_bytes_init(const struct nft_ctx *ctx,\n+\t\t\t\tconst struct nft_expr *expr,\n+\t\t\t\tconst struct nlattr * const tb[])\n {\n \tstruct nft_limit *priv = nft_expr_priv(expr);\n \n \treturn nft_limit_init(priv, tb);\n }\n \n-static int nft_limit_pkt_bytes_dump(struct sk_buff *skb,\n-\t\t\t\t const struct nft_expr *expr)\n+static int nft_limit_bytes_dump(struct sk_buff *skb,\n+\t\t\t\tconst struct nft_expr *expr)\n {\n \tconst struct nft_limit *priv = nft_expr_priv(expr);\n \n \treturn nft_limit_dump(skb, priv, NFT_LIMIT_PKT_BYTES);\n }\n \n-static const struct nft_expr_ops nft_limit_pkt_bytes_ops = {\n+static const struct nft_expr_ops nft_limit_bytes_ops = {\n \t.type\t\t= &nft_limit_type,\n \t.size\t\t= NFT_EXPR_SIZE(sizeof(struct nft_limit)),\n-\t.eval\t\t= nft_limit_pkt_bytes_eval,\n-\t.init\t\t= nft_limit_pkt_bytes_init,\n-\t.dump\t\t= nft_limit_pkt_bytes_dump,\n+\t.eval\t\t= nft_limit_bytes_eval,\n+\t.init\t\t= nft_limit_bytes_init,\n+\t.dump\t\t= nft_limit_bytes_dump,\n };\n \n static const struct nft_expr_ops *\n@@ -215,7 +215,7 @@ nft_limit_select_ops(const struct nft_ctx *ctx,\n \tcase NFT_LIMIT_PKTS:\n \t\treturn &nft_limit_pkts_ops;\n \tcase NFT_LIMIT_PKT_BYTES:\n-\t\treturn &nft_limit_pkt_bytes_ops;\n+\t\treturn &nft_limit_bytes_ops;\n \t}\n \treturn ERR_PTR(-EOPNOTSUPP);\n }\n","prefixes":["03/12"]}