Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[cascardo/linux.git] / net / ipv4 / netfilter.c

diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c
index 1725dc0..c14623f 100644 (file)
--- a/net/ipv4/netfilter.c
+++ b/net/ipv4/netfilter.c
@@ -155,10 +155,10 @@ static int nf_ip_reroute(struct sk_buff *skb,
        if (entry->hook == NF_INET_LOCAL_OUT) {
                const struct iphdr *iph = ip_hdr(skb);
 
-               if (!(iph->tos == rt_info->tos
-                     && skb->mark == rt_info->mark
-                     && iph->daddr == rt_info->daddr
-                     && iph->saddr == rt_info->saddr))
+               if (!(iph->tos == rt_info->tos &&
+                     skb->mark == rt_info->mark &&
+                     iph->daddr == rt_info->daddr &&
+                     iph->saddr == rt_info->saddr))
                        return ip_route_me_harder(skb, RTN_UNSPEC);
        }
        return 0;
@@ -248,9 +248,9 @@ module_exit(ipv4_netfilter_fini);
 
 #ifdef CONFIG_SYSCTL
 struct ctl_path nf_net_ipv4_netfilter_sysctl_path[] = {
-       { .procname = "net", .ctl_name = CTL_NET, },
-       { .procname = "ipv4", .ctl_name = NET_IPV4, },
-       { .procname = "netfilter", .ctl_name = NET_IPV4_NETFILTER, },
+       { .procname = "net", },
+       { .procname = "ipv4", },
+       { .procname = "netfilter", },
        { }
 };
 EXPORT_SYMBOL_GPL(nf_net_ipv4_netfilter_sysctl_path);