{"id":805165,"url":"http://patchwork.ozlabs.org/api/1.2/patches/805165/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20170823204125.31427-2-pablombg@gmail.com/","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/1.2/projects/26/?format=json","name":"Netfilter Development","link_name":"netfilter-devel","list_id":"netfilter-devel.vger.kernel.org","list_email":"netfilter-devel@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170823204125.31427-2-pablombg@gmail.com>","list_archive_url":null,"date":"2017-08-23T20:41:24","name":"[nf-next,2/3] netfilter: nft_limit: replace pkt_bytes with bytes","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"1203f8527af99001928b9ab27c3462b15e401771","submitter":{"id":67698,"url":"http://patchwork.ozlabs.org/api/1.2/people/67698/?format=json","name":"Pablo M. Bermudo Garay","email":"pablombg@gmail.com"},"delegate":{"id":6139,"url":"http://patchwork.ozlabs.org/api/1.2/users/6139/?format=json","username":"pablo","first_name":"Pablo","last_name":"Neira","email":"pablo@netfilter.org"},"mbox":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20170823204125.31427-2-pablombg@gmail.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/805165/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/805165/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.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=netfilter-devel-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"n1M9UPHO\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xczrM565Gz9t34\n\tfor ;\n\tThu, 24 Aug 2017 06:42:27 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754184AbdHWUmS (ORCPT );\n\tWed, 23 Aug 2017 16:42:18 -0400","from mail-wm0-f68.google.com ([74.125.82.68]:37145 \"EHLO\n\tmail-wm0-f68.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1754167AbdHWUmQ (ORCPT\n\t);\n\tWed, 23 Aug 2017 16:42:16 -0400","by mail-wm0-f68.google.com with SMTP id v186so693116wmf.4\n\tfor ;\n\tWed, 23 Aug 2017 13:42:16 -0700 (PDT)","from localhost.localdomain (75.red-88-9-82.dynamicip.rima-tde.net.\n\t[88.9.82.75]) by smtp.gmail.com with ESMTPSA id\n\t65sm2035727wmf.0.2017.08.23.13.42.14\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 23 Aug 2017 13:42:14 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=U8/+QNTYOP0ONqhhDICnTX8nezGAbQoxl3Ibww3TgdQ=;\n\tb=n1M9UPHOJaX+FobAETSMkmUfFuA+JuifP8ckhSm6WU0L2p8e7MBELcIVZHdsX2mBOh\n\tcL56yI/yj8/IFvMjRVXFM77+alFaZCDIJjxuFacywgxK+J7248zIeHFIn72SLR91iZ02\n\tR3CX+DcJQS0oHtf5Zb/qwmfUzy3wftTmjnNgeQcS86cXOBFxI9uoAiM2kuBFLDW8iGz+\n\tOz6CJ2pwOCkbMTTim2BqPhOUAL+BxW4y1Nxl8AHZ8o9dVAgyY2gnzlxEwEUhhm+8zvEn\n\tBGS/z3dmqOoZnsOVbF3SRnKyC4Owwo1J0NH6P7IDApt71VIzoC5nMuKZzDa/Z1iWsXF9\n\tuHfA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=U8/+QNTYOP0ONqhhDICnTX8nezGAbQoxl3Ibww3TgdQ=;\n\tb=ETcFip8xL/22C3C418xPuQNRuDwXZXae5Onj/4FF9CYXbiCFFJUlJ4llWzlsvUiWCK\n\tNhBkzLZpT1y9Bix+VJ6ri4mxDS7B6TZ9lfO5G9tqpzP0OlB/dagOxPsN+5HRB9oAVD6f\n\tYyDJfhsUR4R/Iyp8dIT73lsy3gHSfNRw94iitDaUhUdnfMG8cgXbkpEcCH4phL+gDUHc\n\tls8hv0OzLSUFrEYxJc5/15yg7TI0iQg+aEUoNMSNQFIrChQiuMp0RbWCS0Ggw86s86oH\n\tUnIdmhn1+XOEVGx70Sr2CmJfpK2vYtIgwLtd2D3e99frBXW1huWMbd8Gn/VIXu5zxTSZ\n\tznMQ==","X-Gm-Message-State":"AHYfb5gXkyL3szGyrIPCDNrB8OwZN6MFkyja9cCB8R1DztnymOiIQ62B\n\tEgRuzYmiLRZVznFDwfo=","X-Received":"by 10.28.19.69 with SMTP id 66mr2880796wmt.141.1503520935494;\n\tWed, 23 Aug 2017 13:42:15 -0700 (PDT)","From":"\"Pablo M. Bermudo Garay\" ","To":"netfilter-devel@vger.kernel.org","Cc":"pablo@netfilter.org, \"Pablo M. Bermudo Garay\" ","Subject":"[PATCH nf-next 2/3] netfilter: nft_limit: replace pkt_bytes with\n\tbytes","Date":"Wed, 23 Aug 2017 22:41:24 +0200","Message-Id":"<20170823204125.31427-2-pablombg@gmail.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20170823204125.31427-1-pablombg@gmail.com>","References":"<20170823204125.31427-1-pablombg@gmail.com>","Sender":"netfilter-devel-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netfilter-devel@vger.kernel.org"},"content":"Just a small refactor patch in order to improve the code readability.\n\nSigned-off-by: Pablo M. Bermudo Garay \n---\n include/uapi/linux/netfilter/nf_tables.h | 2 +-\n net/netfilter/nft_limit.c | 30 +++++++++++++++---------------\n 2 files changed, 16 insertions(+), 16 deletions(-)","diff":"diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h\nindex be25cf69295b..dc7661c293b8 100644\n--- a/include/uapi/linux/netfilter/nf_tables.h\n+++ b/include/uapi/linux/netfilter/nf_tables.h\n@@ -946,7 +946,7 @@ enum nft_ct_attributes {\n \n enum nft_limit_type {\n \tNFT_LIMIT_PKTS,\n-\tNFT_LIMIT_PKT_BYTES\n+\tNFT_LIMIT_BYTES\n };\n \n enum nft_limit_flags {\ndiff --git a/net/netfilter/nft_limit.c b/net/netfilter/nft_limit.c\nindex 18dd57a52651..d66b4de5b07c 100644\n--- a/net/netfilter/nft_limit.c\n+++ b/net/netfilter/nft_limit.c\n@@ -165,9 +165,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@@ -176,29 +176,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+\treturn nft_limit_dump(skb, priv, NFT_LIMIT_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@@ -211,8 +211,8 @@ nft_limit_select_ops(const struct nft_ctx *ctx,\n \tswitch (ntohl(nla_get_be32(tb[NFTA_LIMIT_TYPE]))) {\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+\tcase NFT_LIMIT_BYTES:\n+\t\treturn &nft_limit_bytes_ops;\n \t}\n \treturn ERR_PTR(-EOPNOTSUPP);\n }\n","prefixes":["nf-next","2/3"]}