aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/netfilter/iptable_security.c
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2009-06-13 06:57:10 +0200
committerJan Engelhardt <jengelh@medozas.de>2010-02-10 17:03:53 +0100
commit2b21e051472fdb4680076278b2ccf63ebc1cc3bc (patch)
tree284c85824fcc2de0016451be071f4dd2b377e9cb /net/ipv4/netfilter/iptable_security.c
parentnetfilter: xtables: compact table hook functions (1/2) (diff)
downloadlinux-dev-2b21e051472fdb4680076278b2ccf63ebc1cc3bc.tar.xz
linux-dev-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/iptable_security.c')
-rw-r--r--net/ipv4/netfilter/iptable_security.c23
1 files changed, 10 insertions, 13 deletions
diff --git a/net/ipv4/netfilter/iptable_security.c b/net/ipv4/netfilter/iptable_security.c
index 1c666bab3269..324505aaaa73 100644
--- a/net/ipv4/netfilter/iptable_security.c
+++ b/net/ipv4/netfilter/iptable_security.c
@@ -70,19 +70,16 @@ iptable_security_hook(unsigned int hook, struct sk_buff *skb,
const struct net_device *out,
int (*okfn)(struct sk_buff *))
{
- if (hook == NF_INET_LOCAL_OUT) {
- if (skb->len < sizeof(struct iphdr) ||
- ip_hdrlen(skb) < sizeof(struct iphdr))
- /* Somebody is playing with raw sockets. */
- return NF_ACCEPT;
-
- return ipt_do_table(skb, hook, in, out,
- dev_net(out)->ipv4.iptable_security);
- }
-
- /* INPUT/FORWARD: */
- return ipt_do_table(skb, hook, in, out,
- dev_net(in)->ipv4.iptable_security);
+ const struct net *net;
+
+ if (hook == NF_INET_LOCAL_OUT &&
+ (skb->len < sizeof(struct iphdr) ||
+ ip_hdrlen(skb) < sizeof(struct iphdr)))
+ /* Somebody is playing with raw sockets. */
+ return NF_ACCEPT;
+
+ net = dev_net((in != NULL) ? in : out);
+ return ipt_do_table(skb, hook, in, out, net->ipv4.iptable_security);
}
static struct nf_hook_ops ipt_ops[] __read_mostly = {