diff options
author | Joe Perches <joe@perches.com> | 2009-11-29 19:55:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-29 19:55:45 -0500 |
commit | f64f9e719261a87818dd192a3a2352e5b20fbd0f (patch) | |
tree | b2d5cbaef3df615295f6061d8c4d6a912690556c /net/netfilter | |
parent | 152b6a62aea2d43359dd37004e9c218bf7bdeb3b (diff) |
net: Move && and || to end of previous line
Not including net/atm/
Compiled tested x86 allyesconfig only
Added a > 80 column line or two, which I ignored.
Existing checkpatch plaints willfully, cheerfully ignored.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter')
-rw-r--r-- | net/netfilter/nf_conntrack_expect.c | 6 | ||||
-rw-r--r-- | net/netfilter/nf_conntrack_ftp.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c index 2032dfe25ca8..fdf5d2a1d9b4 100644 --- a/net/netfilter/nf_conntrack_expect.c +++ b/net/netfilter/nf_conntrack_expect.c | |||
@@ -202,9 +202,9 @@ static inline int expect_clash(const struct nf_conntrack_expect *a, | |||
202 | static inline int expect_matches(const struct nf_conntrack_expect *a, | 202 | static inline int expect_matches(const struct nf_conntrack_expect *a, |
203 | const struct nf_conntrack_expect *b) | 203 | const struct nf_conntrack_expect *b) |
204 | { | 204 | { |
205 | return a->master == b->master && a->class == b->class | 205 | return a->master == b->master && a->class == b->class && |
206 | && nf_ct_tuple_equal(&a->tuple, &b->tuple) | 206 | nf_ct_tuple_equal(&a->tuple, &b->tuple) && |
207 | && nf_ct_tuple_mask_equal(&a->mask, &b->mask); | 207 | nf_ct_tuple_mask_equal(&a->mask, &b->mask); |
208 | } | 208 | } |
209 | 209 | ||
210 | /* Generally a bad idea to call this: could have matched already. */ | 210 | /* Generally a bad idea to call this: could have matched already. */ |
diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c index 5509dd1f14cf..38ea7ef3ccd2 100644 --- a/net/netfilter/nf_conntrack_ftp.c +++ b/net/netfilter/nf_conntrack_ftp.c | |||
@@ -243,8 +243,8 @@ static int try_epsv_response(const char *data, size_t dlen, | |||
243 | /* Three delimiters. */ | 243 | /* Three delimiters. */ |
244 | if (dlen <= 3) return 0; | 244 | if (dlen <= 3) return 0; |
245 | delim = data[0]; | 245 | delim = data[0]; |
246 | if (isdigit(delim) || delim < 33 || delim > 126 | 246 | if (isdigit(delim) || delim < 33 || delim > 126 || |
247 | || data[1] != delim || data[2] != delim) | 247 | data[1] != delim || data[2] != delim) |
248 | return 0; | 248 | return 0; |
249 | 249 | ||
250 | return get_port(data, 3, dlen, delim, &cmd->u.tcp.port); | 250 | return get_port(data, 3, dlen, delim, &cmd->u.tcp.port); |
@@ -366,8 +366,8 @@ static int help(struct sk_buff *skb, | |||
366 | typeof(nf_nat_ftp_hook) nf_nat_ftp; | 366 | typeof(nf_nat_ftp_hook) nf_nat_ftp; |
367 | 367 | ||
368 | /* Until there's been traffic both ways, don't look in packets. */ | 368 | /* Until there's been traffic both ways, don't look in packets. */ |
369 | if (ctinfo != IP_CT_ESTABLISHED | 369 | if (ctinfo != IP_CT_ESTABLISHED && |
370 | && ctinfo != IP_CT_ESTABLISHED+IP_CT_IS_REPLY) { | 370 | ctinfo != IP_CT_ESTABLISHED + IP_CT_IS_REPLY) { |
371 | pr_debug("ftp: Conntrackinfo = %u\n", ctinfo); | 371 | pr_debug("ftp: Conntrackinfo = %u\n", ctinfo); |
372 | return NF_ACCEPT; | 372 | return NF_ACCEPT; |
373 | } | 373 | } |