{"id":809472,"url":"http://patchwork.ozlabs.org/api/1.2/patches/809472/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1504478435-13160-6-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":"<1504478435-13160-6-git-send-email-pablo@netfilter.org>","list_archive_url":null,"date":"2017-09-03T22:40:16","name":"[28/47] netfilter: exthdr: split netlink dump function","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"7c3af38a90c326a5f2c60b4cae244388370a0b5d","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/1504478435-13160-6-git-send-email-pablo@netfilter.org/mbox/","series":[{"id":1283,"url":"http://patchwork.ozlabs.org/api/1.2/series/1283/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=1283","date":"2017-09-03T22:40:11","name":null,"version":1,"mbox":"http://patchwork.ozlabs.org/series/1283/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/809472/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809472/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 3xlp3X5bNXz9s06\n\tfor ;\n\tMon, 4 Sep 2017 08:45:44 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753267AbdICWpm (ORCPT );\n\tSun, 3 Sep 2017 18:45:42 -0400","from mail.us.es ([193.147.175.20]:52688 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1753266AbdICWkz (ORCPT );\n\tSun, 3 Sep 2017 18:40:55 -0400","from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id 863F1190F61\n\tfor ; Mon, 4 Sep 2017 00:40:28 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 6C6EBB5028\n\tfor ; Mon, 4 Sep 2017 00:40:28 +0200 (CEST)","by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid 6240DCE372; Mon, 4 Sep 2017 00:40:28 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 5BEE8B502C;\n\tMon, 4 Sep 2017 00:40:26 +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 00:40:26 +0200 (CEST)","from salvia.here (unknown [31.4.193.113])\n\t(Authenticated sender: 1984lsi)\n\tby entrada.int (Postfix) with ESMTPA id 139784265A20;\n\tMon, 4 Sep 2017 00:40:26 +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 28/47] netfilter: exthdr: split netlink dump function","Date":"Mon, 4 Sep 2017 00:40:16 +0200","Message-Id":"<1504478435-13160-6-git-send-email-pablo@netfilter.org>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1504478435-13160-1-git-send-email-pablo@netfilter.org>","References":"<1504478435-13160-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: Florian Westphal \n\nso eval and uncoming eval_set versions can reuse a common helper.\n\nSigned-off-by: Florian Westphal \nSigned-off-by: Pablo Neira Ayuso \n---\n net/netfilter/nft_exthdr.c | 16 +++++++++++-----\n 1 file changed, 11 insertions(+), 5 deletions(-)","diff":"diff --git a/net/netfilter/nft_exthdr.c b/net/netfilter/nft_exthdr.c\nindex 921c95f2c583..e3a6eebe7e0c 100644\n--- a/net/netfilter/nft_exthdr.c\n+++ b/net/netfilter/nft_exthdr.c\n@@ -180,12 +180,8 @@ static int nft_exthdr_init(const struct nft_ctx *ctx,\n \t\t\t\t\t NFT_DATA_VALUE, priv->len);\n }\n \n-static int nft_exthdr_dump(struct sk_buff *skb, const struct nft_expr *expr)\n+static int nft_exthdr_dump_common(struct sk_buff *skb, const struct nft_exthdr *priv)\n {\n-\tconst struct nft_exthdr *priv = nft_expr_priv(expr);\n-\n-\tif (nft_dump_register(skb, NFTA_EXTHDR_DREG, priv->dreg))\n-\t\tgoto nla_put_failure;\n \tif (nla_put_u8(skb, NFTA_EXTHDR_TYPE, priv->type))\n \t\tgoto nla_put_failure;\n \tif (nla_put_be32(skb, NFTA_EXTHDR_OFFSET, htonl(priv->offset)))\n@@ -202,6 +198,16 @@ static int nft_exthdr_dump(struct sk_buff *skb, const struct nft_expr *expr)\n \treturn -1;\n }\n \n+static int nft_exthdr_dump(struct sk_buff *skb, const struct nft_expr *expr)\n+{\n+\tconst struct nft_exthdr *priv = nft_expr_priv(expr);\n+\n+\tif (nft_dump_register(skb, NFTA_EXTHDR_DREG, priv->dreg))\n+\t\treturn -1;\n+\n+\treturn nft_exthdr_dump_common(skb, priv);\n+}\n+\n static struct nft_expr_type nft_exthdr_type;\n static const struct nft_expr_ops nft_exthdr_ipv6_ops = {\n \t.type\t\t= &nft_exthdr_type,\n","prefixes":["28/47"]}