{"id":809431,"url":"http://patchwork.ozlabs.org/api/1.2/patches/809431/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504478516-13224-3-git-send-email-pablo@netfilter.org/","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":"<1504478516-13224-3-git-send-email-pablo@netfilter.org>","list_archive_url":null,"date":"2017-09-03T22:41:44","name":"[35/47] netfilter: conntrack: reduce size of l4protocol trackers","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"b214967dd29aa1ec3ef276c19fb5c5ae35ce13b7","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":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/1504478516-13224-3-git-send-email-pablo@netfilter.org/mbox/","series":[{"id":1282,"url":"http://patchwork.ozlabs.org/api/1.2/series/1282/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=1282","date":"2017-09-03T22:40:11","name":null,"version":1,"mbox":"http://patchwork.ozlabs.org/series/1282/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/809431/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809431/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=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xlnzn0mfNz9s06\n\tfor ;\n\tMon, 4 Sep 2017 08:42:29 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753455AbdICWmW (ORCPT );\n\tSun, 3 Sep 2017 18:42:22 -0400","from mail.us.es ([193.147.175.20]:52904 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1753441AbdICWmM (ORCPT );\n\tSun, 3 Sep 2017 18:42:12 -0400","from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id 05FA4190F62\n\tfor ;\n\tMon, 4 Sep 2017 00:41:46 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id EA70EDA2AF\n\tfor ;\n\tMon, 4 Sep 2017 00:41:45 +0200 (CEST)","by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid E0224DA56C; Mon, 4 Sep 2017 00:41:45 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 069A3B502A;\n\tMon, 4 Sep 2017 00:41:44 +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:41:44 +0200 (CEST)","from salvia.here (unknown [31.4.193.113])\n\t(Authenticated sender: 1984lsi)\n\tby entrada.int (Postfix) with ESMTPA id B0DAF4265A20;\n\tMon, 4 Sep 2017 00:41:43 +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 35/47] netfilter: conntrack: reduce size of l4protocol\n\ttrackers","Date":"Mon, 4 Sep 2017 00:41:44 +0200","Message-Id":"<1504478516-13224-3-git-send-email-pablo@netfilter.org>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1504478516-13224-1-git-send-email-pablo@netfilter.org>","References":"<1504478516-13224-1-git-send-email-pablo@netfilter.org>","X-Virus-Scanned":"ClamAV using ClamSMTP","Sender":"netfilter-devel-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netfilter-devel@vger.kernel.org"},"content":"From: Florian Westphal \n\ncan use u16 for both, shrinks size by another 8 bytes.\n\nSigned-off-by: Florian Westphal \nSigned-off-by: Pablo Neira Ayuso \n---\n include/net/netfilter/nf_conntrack_l4proto.h | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)","diff":"diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h\nindex 47c16bae5e00..15c58dd3f701 100644\n--- a/include/net/netfilter/nf_conntrack_l4proto.h\n+++ b/include/net/netfilter/nf_conntrack_l4proto.h\n@@ -92,12 +92,12 @@ struct nf_conntrack_l4proto {\n \n #if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)\n \tstruct {\n-\t\tsize_t obj_size;\n \t\tint (*nlattr_to_obj)(struct nlattr *tb[],\n \t\t\t\t struct net *net, void *data);\n \t\tint (*obj_to_nlattr)(struct sk_buff *skb, const void *data);\n \n-\t\tunsigned int nlattr_max;\n+\t\tu16 obj_size;\n+\t\tu16 nlattr_max;\n \t\tconst struct nla_policy *nla_policy;\n \t} ctnl_timeout;\n #endif\n","prefixes":["35/47"]}