diff options
| author |   Joe Perches <joe@perches.com> | 2009-11-29 16:55:45 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-11-29 16:55:45 -0800 |
| commit | f64f9e719261a87818dd192a3a2352e5b20fbd0f (patch) | |
| tree | b2d5cbaef3df615295f6061d8c4d6a912690556c /net/netfilter/nf_conntrack_expect.c | |
| parent | sfc: Separate shared NIC code from Falcon-specific and rename accordingly (diff) | |
| download | linux-dev-f64f9e719261a87818dd192a3a2352e5b20fbd0f.tar.xz linux-dev-f64f9e719261a87818dd192a3a2352e5b20fbd0f.zip | |
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/nf_conntrack_expect.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_expect.c | 6 |
1 files changed, 3 insertions, 3 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, static inline int expect_matches(const struct nf_conntrack_expect *a, const struct nf_conntrack_expect *b) { - return a->master == b->master && a->class == b->class - && nf_ct_tuple_equal(&a->tuple, &b->tuple) - && nf_ct_tuple_mask_equal(&a->mask, &b->mask); + return a->master == b->master && a->class == b->class && + nf_ct_tuple_equal(&a->tuple, &b->tuple) && + nf_ct_tuple_mask_equal(&a->mask, &b->mask); } /* Generally a bad idea to call this: could have matched already. */ |