From patchwork Thu May 28 23:44:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 478081 X-Patchwork-Delegate: davem@davemloft.net Return-Path: Delivered-To: pablo@netfilter.org Received: from domexternos.us.es [193.147.175.220] by salvia.here with POP3 (fetchmail-6.3.21) for (single-drop); Fri, 29 May 2015 01:45:58 +0200 (CEST) Received: (qmail 12408 invoked from network); 28 May 2015 23:40:41 -0000 Received: from unknown (HELO mail.us.es) (192.168.3.12) by a6.us.es with SMTP; 28 May 2015 23:40:41 -0000 Received: (qmail 22655 invoked from network); 29 May 2015 01:40:41 +0200 Received: from unknown (HELO us.es) (192.168.2.14) by us.es with SMTP; 29 May 2015 01:40:41 +0200 Received: (qmail 15872 invoked by uid 507); 28 May 2015 23:40:41 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus4 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.98.7/20520. spamassassin: 3.4.0. Clear:RC:1(127.0.0.1):SA:0(-108.2/7.5):. Processed in 2.530294 secs); 28 May 2015 23:40:41 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on antivirus4 X-Spam-Level: X-Spam-Status: No, score=-108.2 required=7.5 tests=BAYES_50, RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SMTPAUTH_US,USER_IN_WHITELIST autolearn=disabled version=3.4.0 X-Spam-ASN: AS31976 209.132.180.0/23 X-Envelope-From: netdev-owner@vger.kernel.org Received: from unknown (HELO antivirus4) (127.0.0.1) by us.es with SMTP; 28 May 2015 23:40:38 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus4 (F-Secure/fsigk_smtp/412/antivirus4); Fri, 29 May 2015 01:40:38 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/412/antivirus4) Received: (qmail 25643 invoked from network); 29 May 2015 01:40:38 +0200 Received: from vger.kernel.org (209.132.180.67) by us.es with SMTP; 29 May 2015 01:40:38 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932448AbbE1XkM (ORCPT ); Thu, 28 May 2015 19:40:12 -0400 Received: from mail.us.es ([193.147.175.20]:40647 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932401AbbE1Xj7 (ORCPT ); Thu, 28 May 2015 19:39:59 -0400 Received: (qmail 22399 invoked from network); 29 May 2015 01:39:56 +0200 Received: from unknown (HELO us.es) (192.168.2.13) by us.es with SMTP; 29 May 2015 01:39:56 +0200 Received: (qmail 27747 invoked by uid 507); 28 May 2015 23:39:56 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus3 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.98.7/20520. spamassassin: 3.4.0. Clear:RC:1(127.0.0.1):SA:0(-103.2/7.5):. Processed in 1.861303 secs); 28 May 2015 23:39:56 -0000 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus3) (127.0.0.1) by us.es with SMTP; 28 May 2015 23:39:54 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus3 (F-Secure/fsigk_smtp/412/antivirus3); Fri, 29 May 2015 01:39:54 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/412/antivirus3) Received: (qmail 24777 invoked from network); 29 May 2015 01:39:54 +0200 Received: from 77.166.216.87.static.jazztel.es (HELO salvia.here) (pneira@us.es@87.216.166.77) by mail.us.es with SMTP; 29 May 2015 01:39:54 +0200 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH 1/4] netfilter: remove unused comefrom hookmask argument Date: Fri, 29 May 2015 01:44:52 +0200 Message-Id: <1432856695-23831-2-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1432856695-23831-1-git-send-email-pablo@netfilter.org> References: <1432856695-23831-1-git-send-email-pablo@netfilter.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Status: RO Content-Length: 2055 From: Florian Westphal Signed-off-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso --- net/ipv4/netfilter/ip_tables.c | 4 +--- net/ipv6/netfilter/ip6_tables.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c index c69db7f..583779f 100644 --- a/net/ipv4/netfilter/ip_tables.c +++ b/net/ipv4/netfilter/ip_tables.c @@ -1441,7 +1441,6 @@ static int compat_find_calc_match(struct xt_entry_match *m, const char *name, const struct ipt_ip *ip, - unsigned int hookmask, int *size) { struct xt_match *match; @@ -1510,8 +1509,7 @@ check_compat_entry_size_and_hooks(struct compat_ipt_entry *e, entry_offset = (void *)e - (void *)base; j = 0; xt_ematch_foreach(ematch, e) { - ret = compat_find_calc_match(ematch, name, - &e->ip, e->comefrom, &off); + ret = compat_find_calc_match(ematch, name, &e->ip, &off); if (ret != 0) goto release_matches; ++j; diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c index 1a732a1..d54f049 100644 --- a/net/ipv6/netfilter/ip6_tables.c +++ b/net/ipv6/netfilter/ip6_tables.c @@ -1456,7 +1456,6 @@ static int compat_find_calc_match(struct xt_entry_match *m, const char *name, const struct ip6t_ip6 *ipv6, - unsigned int hookmask, int *size) { struct xt_match *match; @@ -1525,8 +1524,7 @@ check_compat_entry_size_and_hooks(struct compat_ip6t_entry *e, entry_offset = (void *)e - (void *)base; j = 0; xt_ematch_foreach(ematch, e) { - ret = compat_find_calc_match(ematch, name, - &e->ipv6, e->comefrom, &off); + ret = compat_find_calc_match(ematch, name, &e->ipv6, &off); if (ret != 0) goto release_matches; ++j;