diff options
| author | Jan Engelhardt | 2009-06-13 06:57:10 +0200 |
|---|---|---|
| committer | Jan Engelhardt | 2010-02-10 17:03:53 +0100 |
| commit | 2b21e051472fdb4680076278b2ccf63ebc1cc3bc (patch) | |
| tree | 284c85824fcc2de0016451be071f4dd2b377e9cb /net/ipv4/netfilter/arptable_filter.c | |
| parent | netfilter: xtables: compact table hook functions (1/2) (diff) | |
| download | kernel-qcow2-linux-2b21e051472fdb4680076278b2ccf63ebc1cc3bc.tar.gz kernel-qcow2-linux-2b21e051472fdb4680076278b2ccf63ebc1cc3bc.tar.xz kernel-qcow2-linux-2b21e051472fdb4680076278b2ccf63ebc1cc3bc.zip | |
netfilter: xtables: compact table hook functions (2/2)
The calls to ip6t_do_table only show minimal differences, so it seems
like a good cleanup to merge them to a single one too.
Space saving obtained by both patches: 6807725->6807373
("Total" column from `size -A`.)
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'net/ipv4/netfilter/arptable_filter.c')
| -rw-r--r-- | net/ipv4/netfilter/arptable_filter.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/ipv4/netfilter/arptable_filter.c b/net/ipv4/netfilter/arptable_filter.c index e9d823b149cd..deeda9b2cf05 100644 --- a/net/ipv4/netfilter/arptable_filter.c +++ b/net/ipv4/netfilter/arptable_filter.c @@ -58,13 +58,9 @@ arptable_filter_hook(unsigned int hook, struct sk_buff *skb, const struct net_device *in, const struct net_device *out, int (*okfn)(struct sk_buff *)) { - if (hook == NF_ARP_OUT) - return arpt_do_table(skb, hook, in, out, - dev_net(out)->ipv4.arptable_filter); + const struct net *net = dev_net((in != NULL) ? in : out); - /* INPUT/FORWARD: */ - return arpt_do_table(skb, hook, in, out, - dev_net(in)->ipv4.arptable_filter); + return arpt_do_table(skb, hook, in, out, net->ipv4.arptable_filter); } static struct nf_hook_ops arpt_ops[] __read_mostly = { |