{"id":805540,"url":"http://patchwork.ozlabs.org/api/1.2/patches/805540/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20170824154225.30763-1-fw@strlen.de/","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":"<20170824154225.30763-1-fw@strlen.de>","list_archive_url":null,"date":"2017-08-24T15:42:25","name":"[nf-next] netfilter: conntrack: remove unused hooknum arg from packet functions","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"d98a468afae668ef3b01625409b2c504ef36aca5","submitter":{"id":1025,"url":"http://patchwork.ozlabs.org/api/1.2/people/1025/?format=json","name":"Florian Westphal","email":"fw@strlen.de"},"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/20170824154225.30763-1-fw@strlen.de/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/805540/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/805540/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 3xdT7P2DHDz9s3T\n\tfor ;\n\tFri, 25 Aug 2017 01:42:09 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753215AbdHXPmI (ORCPT );\n\tThu, 24 Aug 2017 11:42:08 -0400","from Chamillionaire.breakpoint.cc ([146.0.238.67]:36482 \"EHLO\n\tChamillionaire.breakpoint.cc\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1752984AbdHXPmH (ORCPT\n\t);\n\tThu, 24 Aug 2017 11:42:07 -0400","from fw by Chamillionaire.breakpoint.cc with local (Exim 4.84_2)\n\t(envelope-from )\n\tid 1dkuEG-0000wp-G2; Thu, 24 Aug 2017 17:39:32 +0200"],"From":"Florian Westphal ","To":"","Cc":"Florian Westphal ","Subject":"[PATCH nf-next] netfilter: conntrack: remove unused hooknum arg\n\tfrom packet functions","Date":"Thu, 24 Aug 2017 17:42:25 +0200","Message-Id":"<20170824154225.30763-1-fw@strlen.de>","X-Mailer":"git-send-email 2.13.0","Sender":"netfilter-devel-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netfilter-devel@vger.kernel.org"},"content":"Don't see where this is used; passed allmodconfig build.\n\nSigned-off-by: Florian Westphal \n---\n include/net/netfilter/nf_conntrack_l4proto.h | 1 -\n net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 1 -\n net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 6 ++----\n net/netfilter/nf_conntrack_core.c | 2 +-\n net/netfilter/nf_conntrack_proto_dccp.c | 2 +-\n net/netfilter/nf_conntrack_proto_generic.c | 1 -\n net/netfilter/nf_conntrack_proto_gre.c | 1 -\n net/netfilter/nf_conntrack_proto_sctp.c | 1 -\n net/netfilter/nf_conntrack_proto_tcp.c | 1 -\n net/netfilter/nf_conntrack_proto_udp.c | 1 -\n 10 files changed, 4 insertions(+), 13 deletions(-)","diff":"diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h\nindex b6e27cafb1d9..37d5e3e984e7 100644\n--- a/include/net/netfilter/nf_conntrack_l4proto.h\n+++ b/include/net/netfilter/nf_conntrack_l4proto.h\n@@ -43,7 +43,6 @@ struct nf_conntrack_l4proto {\n \t\t unsigned int dataoff,\n \t\t enum ip_conntrack_info ctinfo,\n \t\t u_int8_t pf,\n-\t\t unsigned int hooknum,\n \t\t unsigned int *timeouts);\n \n \t/* Called when a new connection for this protocol found;\ndiff --git a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c\nindex 73c591d8a9a8..302ef5a38d69 100644\n--- a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c\n+++ b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c\n@@ -92,7 +92,6 @@ static int icmp_packet(struct nf_conn *ct,\n \t\t unsigned int dataoff,\n \t\t enum ip_conntrack_info ctinfo,\n \t\t u_int8_t pf,\n-\t\t unsigned int hooknum,\n \t\t unsigned int *timeout)\n {\n \t/* Do not immediately delete the connection after the first\ndiff --git a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c\nindex d5f028e33f65..413c4a0093da 100644\n--- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c\n+++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c\n@@ -105,7 +105,6 @@ static int icmpv6_packet(struct nf_conn *ct,\n \t\t unsigned int dataoff,\n \t\t enum ip_conntrack_info ctinfo,\n \t\t u_int8_t pf,\n-\t\t unsigned int hooknum,\n \t\t unsigned int *timeout)\n {\n \t/* Do not immediately delete the connection after the first\n@@ -144,8 +143,7 @@ static bool icmpv6_new(struct nf_conn *ct, const struct sk_buff *skb,\n static int\n icmpv6_error_message(struct net *net, struct nf_conn *tmpl,\n \t\t struct sk_buff *skb,\n-\t\t unsigned int icmp6off,\n-\t\t unsigned int hooknum)\n+\t\t unsigned int icmp6off)\n {\n \tstruct nf_conntrack_tuple intuple, origtuple;\n \tconst struct nf_conntrack_tuple_hash *h;\n@@ -229,7 +227,7 @@ icmpv6_error(struct net *net, struct nf_conn *tmpl,\n \tif (icmp6h->icmp6_type >= 128)\n \t\treturn NF_ACCEPT;\n \n-\treturn icmpv6_error_message(net, tmpl, skb, dataoff, hooknum);\n+\treturn icmpv6_error_message(net, tmpl, skb, dataoff);\n }\n \n #if IS_ENABLED(CONFIG_NF_CT_NETLINK)\ndiff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c\nindex f2f00eaf217d..92faa72bc55e 100644\n--- a/net/netfilter/nf_conntrack_core.c\n+++ b/net/netfilter/nf_conntrack_core.c\n@@ -1414,7 +1414,7 @@ nf_conntrack_in(struct net *net, u_int8_t pf, unsigned int hooknum,\n \t/* Decide what timeout policy we want to apply to this flow. */\n \ttimeouts = nf_ct_timeout_lookup(net, ct, l4proto);\n \n-\tret = l4proto->packet(ct, skb, dataoff, ctinfo, pf, hooknum, timeouts);\n+\tret = l4proto->packet(ct, skb, dataoff, ctinfo, pf, timeouts);\n \tif (ret <= 0) {\n \t\t/* Invalid: inverse of the return code tells\n \t\t * the netfilter core what to do */\ndiff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c\nindex 4707d997558a..81bfd4399616 100644\n--- a/net/netfilter/nf_conntrack_proto_dccp.c\n+++ b/net/netfilter/nf_conntrack_proto_dccp.c\n@@ -469,7 +469,7 @@ static unsigned int *dccp_get_timeouts(struct net *net)\n \n static int dccp_packet(struct nf_conn *ct, const struct sk_buff *skb,\n \t\t unsigned int dataoff, enum ip_conntrack_info ctinfo,\n-\t\t u_int8_t pf, unsigned int hooknum,\n+\t\t u_int8_t pf,\n \t\t unsigned int *timeouts)\n {\n \tstruct net *net = nf_ct_net(ct);\ndiff --git a/net/netfilter/nf_conntrack_proto_generic.c b/net/netfilter/nf_conntrack_proto_generic.c\nindex d5868bad33a7..cb14a292becc 100644\n--- a/net/netfilter/nf_conntrack_proto_generic.c\n+++ b/net/netfilter/nf_conntrack_proto_generic.c\n@@ -79,7 +79,6 @@ static int generic_packet(struct nf_conn *ct,\n \t\t\t unsigned int dataoff,\n \t\t\t enum ip_conntrack_info ctinfo,\n \t\t\t u_int8_t pf,\n-\t\t\t unsigned int hooknum,\n \t\t\t unsigned int *timeout)\n {\n \tnf_ct_refresh_acct(ct, ctinfo, skb, *timeout);\ndiff --git a/net/netfilter/nf_conntrack_proto_gre.c b/net/netfilter/nf_conntrack_proto_gre.c\nindex 87bb40a3feb5..ee45df00a95f 100644\n--- a/net/netfilter/nf_conntrack_proto_gre.c\n+++ b/net/netfilter/nf_conntrack_proto_gre.c\n@@ -252,7 +252,6 @@ static int gre_packet(struct nf_conn *ct,\n \t\t unsigned int dataoff,\n \t\t enum ip_conntrack_info ctinfo,\n \t\t u_int8_t pf,\n-\t\t unsigned int hooknum,\n \t\t unsigned int *timeouts)\n {\n \t/* If we've seen traffic both ways, this is a GRE connection.\ndiff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c\nindex 6eef29d2eec4..9361e91b6615 100644\n--- a/net/netfilter/nf_conntrack_proto_sctp.c\n+++ b/net/netfilter/nf_conntrack_proto_sctp.c\n@@ -314,7 +314,6 @@ static int sctp_packet(struct nf_conn *ct,\n \t\t unsigned int dataoff,\n \t\t enum ip_conntrack_info ctinfo,\n \t\t u_int8_t pf,\n-\t\t unsigned int hooknum,\n \t\t unsigned int *timeouts)\n {\n \tenum sctp_conntrack new_state, old_state;\ndiff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c\nindex 9758a7dfd83e..4d516e5d3547 100644\n--- a/net/netfilter/nf_conntrack_proto_tcp.c\n+++ b/net/netfilter/nf_conntrack_proto_tcp.c\n@@ -810,7 +810,6 @@ static int tcp_packet(struct nf_conn *ct,\n \t\t unsigned int dataoff,\n \t\t enum ip_conntrack_info ctinfo,\n \t\t u_int8_t pf,\n-\t\t unsigned int hooknum,\n \t\t unsigned int *timeouts)\n {\n \tstruct net *net = nf_ct_net(ct);\ndiff --git a/net/netfilter/nf_conntrack_proto_udp.c b/net/netfilter/nf_conntrack_proto_udp.c\nindex f6ebce6178ca..092fd87954ed 100644\n--- a/net/netfilter/nf_conntrack_proto_udp.c\n+++ b/net/netfilter/nf_conntrack_proto_udp.c\n@@ -83,7 +83,6 @@ static int udp_packet(struct nf_conn *ct,\n \t\t unsigned int dataoff,\n \t\t enum ip_conntrack_info ctinfo,\n \t\t u_int8_t pf,\n-\t\t unsigned int hooknum,\n \t\t unsigned int *timeouts)\n {\n \t/* If we've seen traffic both ways, this is some kind of UDP\n","prefixes":["nf-next"]}