netfilter: net/ipv[46]/netfilter: Move && and || to end of previous line

[safe/jmp/linux-2.6] / net / ipv4 / netfilter / ipt_CLUSTERIP.c

diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index 2e4f98b..40ca2d2 100644 (file)
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -303,9 +303,9 @@ clusterip_tg(struct sk_buff *skb, const struct xt_target_param *par)
 
        /* special case: ICMP error handling. conntrack distinguishes between
         * error messages (RELATED) and information requests (see below) */
-       if (ip_hdr(skb)->protocol == IPPROTO_ICMP
-           && (ctinfo == IP_CT_RELATED
-               || ctinfo == IP_CT_RELATED+IP_CT_IS_REPLY))
+       if (ip_hdr(skb)->protocol == IPPROTO_ICMP &&
+           (ctinfo == IP_CT_RELATED ||
+            ctinfo == IP_CT_RELATED + IP_CT_IS_REPLY))
                return XT_CONTINUE;
 
        /* ip_conntrack_icmp guarantees us that we only have ICMP_ECHO,
@@ -362,8 +362,8 @@ static bool clusterip_tg_check(const struct xt_tgchk_param *par)
                return false;
 
        }
-       if (e->ip.dmsk.s_addr != htonl(0xffffffff)
-           || e->ip.dst.s_addr == 0) {
+       if (e->ip.dmsk.s_addr != htonl(0xffffffff) ||
+           e->ip.dst.s_addr == 0) {
                printk(KERN_ERR "CLUSTERIP: Please specify destination IP\n");
                return false;
        }
@@ -495,14 +495,14 @@ arp_mangle(unsigned int hook,
        struct clusterip_config *c;
 
        /* we don't care about non-ethernet and non-ipv4 ARP */
-       if (arp->ar_hrd != htons(ARPHRD_ETHER)
-           || arp->ar_pro != htons(ETH_P_IP)
-           || arp->ar_pln != 4 || arp->ar_hln != ETH_ALEN)
+       if (arp->ar_hrd != htons(ARPHRD_ETHER) ||
+           arp->ar_pro != htons(ETH_P_IP) ||
+           arp->ar_pln != 4 || arp->ar_hln != ETH_ALEN)
                return NF_ACCEPT;
 
        /* we only want to mangle arp requests and replies */
-       if (arp->ar_op != htons(ARPOP_REPLY)
-           && arp->ar_op != htons(ARPOP_REQUEST))
+       if (arp->ar_op != htons(ARPOP_REPLY) &&
+           arp->ar_op != htons(ARPOP_REQUEST))
                return NF_ACCEPT;
 
        payload = (void *)(arp+1);