From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 05/10] netfilter: xt_osf: simplify xt_osf_match_packet()
Date: Sat, 20 Oct 2018 11:43:12 +0200 [thread overview]
Message-ID: <20181020094317.16011-6-pablo@netfilter.org> (raw)
In-Reply-To: <20181020094317.16011-1-pablo@netfilter.org>
info area in match is always available, and remove unneeded variables.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/xt_osf.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/net/netfilter/xt_osf.c b/net/netfilter/xt_osf.c
index bf7bba80e24c..7a103553d10d 100644
--- a/net/netfilter/xt_osf.c
+++ b/net/netfilter/xt_osf.c
@@ -40,14 +40,8 @@
static bool
xt_osf_match_packet(const struct sk_buff *skb, struct xt_action_param *p)
{
- const struct xt_osf_info *info = p->matchinfo;
- struct net *net = xt_net(p);
-
- if (!info)
- return false;
-
return nf_osf_match(skb, xt_family(p), xt_hooknum(p), xt_in(p),
- xt_out(p), info, net, nf_osf_fingers);
+ xt_out(p), p->matchinfo, xt_net(p), nf_osf_fingers);
}
static struct xt_match xt_osf_match = {
--
2.11.0
next prev parent reply other threads:[~2018-10-20 9:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-20 9:43 [PATCH 00/10] Netfilter updates for net-next Pablo Neira Ayuso
2018-10-20 9:43 ` [PATCH 01/10] netfilter: Replace spin_is_locked() with lockdep Pablo Neira Ayuso
2018-10-20 9:43 ` [PATCH 02/10] netfilter: cttimeout: remove set but not used variable 'l3num' Pablo Neira Ayuso
2018-10-20 9:43 ` [PATCH 03/10] netfilter: nft_osf: Add ttl option support Pablo Neira Ayuso
2018-10-20 9:43 ` [PATCH 04/10] netfilter: nft_xfrm: use state family, not hook one Pablo Neira Ayuso
2018-10-20 9:43 ` Pablo Neira Ayuso [this message]
2018-10-20 9:43 ` [PATCH 06/10] netfilter: nf_nat_snmp_basic: add missing helper alias name Pablo Neira Ayuso
2018-10-20 9:43 ` [PATCH 07/10] netfilter: nf_flow_table: remove unnecessary parameter of nf_flow_table_cleanup() Pablo Neira Ayuso
2018-10-20 9:43 ` [PATCH 08/10] netfilter: remove two unused variables Pablo Neira Ayuso
2018-10-20 9:43 ` [PATCH 09/10] netfilter: nfnetlink_log: remove empty nfnetlink_log.h header file Pablo Neira Ayuso
2018-10-20 9:43 ` [PATCH 10/10] Revert "netfilter: xt_quota: fix the behavior of xt_quota module" Pablo Neira Ayuso
2018-10-20 19:33 ` [PATCH 00/10] Netfilter updates for net-next David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181020094317.16011-6-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).