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/sched/sch_teql.c | |
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/sched/sch_teql.c')
-rw-r--r-- | net/sched/sch_teql.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c index 5a002c247231..db69637069c4 100644 --- a/net/sched/sch_teql.c +++ b/net/sched/sch_teql.c | |||
@@ -190,10 +190,13 @@ static int teql_qdisc_init(struct Qdisc *sch, struct nlattr *opt) | |||
190 | 190 | ||
191 | if (m->slaves) { | 191 | if (m->slaves) { |
192 | if (m->dev->flags & IFF_UP) { | 192 | if (m->dev->flags & IFF_UP) { |
193 | if ((m->dev->flags&IFF_POINTOPOINT && !(dev->flags&IFF_POINTOPOINT)) | 193 | if ((m->dev->flags & IFF_POINTOPOINT && |
194 | || (m->dev->flags&IFF_BROADCAST && !(dev->flags&IFF_BROADCAST)) | 194 | !(dev->flags & IFF_POINTOPOINT)) || |
195 | || (m->dev->flags&IFF_MULTICAST && !(dev->flags&IFF_MULTICAST)) | 195 | (m->dev->flags & IFF_BROADCAST && |
196 | || dev->mtu < m->dev->mtu) | 196 | !(dev->flags & IFF_BROADCAST)) || |
197 | (m->dev->flags & IFF_MULTICAST && | ||
198 | !(dev->flags & IFF_MULTICAST)) || | ||
199 | dev->mtu < m->dev->mtu) | ||
197 | return -EINVAL; | 200 | return -EINVAL; |
198 | } else { | 201 | } else { |
199 | if (!(dev->flags&IFF_POINTOPOINT)) | 202 | if (!(dev->flags&IFF_POINTOPOINT)) |