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

[deliverable/linux.git] / net / ipv6 / netfilter / ip6t_ah.c

diff --git a/net/ipv6/netfilter/ip6t_ah.c b/net/ipv6/netfilter/ip6t_ah.c
index 3a82f24746b99f82af6bb8a8cb34741ad2d37211..ac0b7c629d78d05715400f2160b029eba32b081c 100644 (file)
--- a/net/ipv6/netfilter/ip6t_ah.c
+++ b/net/ipv6/netfilter/ip6t_ah.c
@@ -77,17 +77,14 @@ static bool ah_mt6(const struct sk_buff *skb, const struct xt_match_param *par)
                 ahinfo->hdrres, ah->reserved,
                 !(ahinfo->hdrres && ah->reserved));
 
-       return (ah != NULL)
-              &&
-              spi_match(ahinfo->spis[0], ahinfo->spis[1],
-                        ntohl(ah->spi),
-                        !!(ahinfo->invflags & IP6T_AH_INV_SPI))
-              &&
-              (!ahinfo->hdrlen ||
-               (ahinfo->hdrlen == hdrlen) ^
-               !!(ahinfo->invflags & IP6T_AH_INV_LEN))
-              &&
-              !(ahinfo->hdrres && ah->reserved);
+       return (ah != NULL) &&
+               spi_match(ahinfo->spis[0], ahinfo->spis[1],
+                         ntohl(ah->spi),
+                         !!(ahinfo->invflags & IP6T_AH_INV_SPI)) &&
+               (!ahinfo->hdrlen ||
+                (ahinfo->hdrlen == hdrlen) ^
+                !!(ahinfo->invflags & IP6T_AH_INV_LEN)) &&
+               !(ahinfo->hdrres && ah->reserved);
 }
 
 static bool ah_mt6_check(const struct xt_mtchk_param *par)