diff options
author | Joe Perches <joe@perches.com> | 2009-11-23 23:17:06 +0100 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2009-11-23 23:17:06 +0100 |
commit | 3666ed1c4837fd6906da0224c5373d7a2186a193 (patch) | |
tree | 4f8c035731606e28536d83dc8b8e871d9cc39090 /net/ipv6/netfilter/ip6t_rt.c | |
parent | netfilter: xtables: fix conntrack match v1 ipt-save output (diff) | |
download | linux-dev-3666ed1c4837fd6906da0224c5373d7a2186a193.tar.xz linux-dev-3666ed1c4837fd6906da0224c5373d7a2186a193.zip |
netfilter: net/ipv[46]/netfilter: Move && and || to end of previous line
Compile tested only.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv6/netfilter/ip6t_rt.c')
-rw-r--r-- | net/ipv6/netfilter/ip6t_rt.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/ipv6/netfilter/ip6t_rt.c b/net/ipv6/netfilter/ip6t_rt.c index 356b8d6f6baa..b77307fc8743 100644 --- a/net/ipv6/netfilter/ip6t_rt.c +++ b/net/ipv6/netfilter/ip6t_rt.c @@ -92,16 +92,13 @@ static bool rt_mt6(const struct sk_buff *skb, const struct xt_match_param *par) !((rtinfo->flags & IP6T_RT_RES) && (((const struct rt0_hdr *)rh)->reserved))); - ret = (rh != NULL) - && + ret = (rh != NULL) && (segsleft_match(rtinfo->segsleft[0], rtinfo->segsleft[1], rh->segments_left, - !!(rtinfo->invflags & IP6T_RT_INV_SGS))) - && + !!(rtinfo->invflags & IP6T_RT_INV_SGS))) && (!(rtinfo->flags & IP6T_RT_LEN) || ((rtinfo->hdrlen == hdrlen) ^ - !!(rtinfo->invflags & IP6T_RT_INV_LEN))) - && + !!(rtinfo->invflags & IP6T_RT_INV_LEN))) && (!(rtinfo->flags & IP6T_RT_TYP) || ((rtinfo->rt_type == rh->type) ^ !!(rtinfo->invflags & IP6T_RT_INV_TYP))); |