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/can/af_can.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/can/af_can.c')
-rw-r--r-- | net/can/af_can.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c index f30671728864..51adc4c2b860 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c | |||
@@ -375,8 +375,8 @@ static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask, | |||
375 | return &d->rx[RX_ALL]; | 375 | return &d->rx[RX_ALL]; |
376 | 376 | ||
377 | /* extra filterlists for the subscription of a single non-RTR can_id */ | 377 | /* extra filterlists for the subscription of a single non-RTR can_id */ |
378 | if (((*mask & CAN_EFF_RTR_FLAGS) == CAN_EFF_RTR_FLAGS) | 378 | if (((*mask & CAN_EFF_RTR_FLAGS) == CAN_EFF_RTR_FLAGS) && |
379 | && !(*can_id & CAN_RTR_FLAG)) { | 379 | !(*can_id & CAN_RTR_FLAG)) { |
380 | 380 | ||
381 | if (*can_id & CAN_EFF_FLAG) { | 381 | if (*can_id & CAN_EFF_FLAG) { |
382 | if (*mask == (CAN_EFF_MASK | CAN_EFF_RTR_FLAGS)) { | 382 | if (*mask == (CAN_EFF_MASK | CAN_EFF_RTR_FLAGS)) { |
@@ -525,8 +525,8 @@ void can_rx_unregister(struct net_device *dev, canid_t can_id, canid_t mask, | |||
525 | */ | 525 | */ |
526 | 526 | ||
527 | hlist_for_each_entry_rcu(r, next, rl, list) { | 527 | hlist_for_each_entry_rcu(r, next, rl, list) { |
528 | if (r->can_id == can_id && r->mask == mask | 528 | if (r->can_id == can_id && r->mask == mask && |
529 | && r->func == func && r->data == data) | 529 | r->func == func && r->data == data) |
530 | break; | 530 | break; |
531 | } | 531 | } |
532 | 532 | ||