* Re: [PATCH 4/42] drivers/infiniband/hw/nes: Adjust confusing if indentation
[not found] <Pine.LNX.4.64.1008052217430.31692@ask.diku.dk>
@ 2010-08-05 20:31 ` Roland Dreier
2010-08-05 23:48 ` [PATCH 4/42 v2] " Dan Carpenter
1 sibling, 0 replies; 3+ messages in thread
From: Roland Dreier @ 2010-08-05 20:31 UTC (permalink / raw)
To: Julia Lawall
Cc: Faisal Latif, Chien Tung, Roland Dreier, Sean Hefty,
Hal Rosenstock, linux-rdma, linux-kernel, kernel-janitors
> It is not clear whether the assignment should be part of the if branch
> suggested by its indentation. The patch preserves the current semantics.
Thanks. Chien/Faisal -- are the current semantics correct or should we
add braces { } to match the indentation? From a quick look at the code,
I think the patch we actually want is:
drivers/infiniband/hw/nes/nes_hw.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
index 07c4004..f8233c8 100644
--- a/drivers/infiniband/hw/nes/nes_hw.c
+++ b/drivers/infiniband/hw/nes/nes_hw.c
@@ -2737,9 +2737,9 @@ void nes_nic_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq)
nesnic->sq_tail &= nesnic->sq_size-1;
if (sq_cqes > 128) {
barrier();
- /* restart the queue if it had been stopped */
- if (netif_queue_stopped(nesvnic->netdev))
- netif_wake_queue(nesvnic->netdev);
+ /* restart the queue if it had been stopped */
+ if (netif_queue_stopped(nesvnic->netdev))
+ netif_wake_queue(nesvnic->netdev);
sq_cqes = 0;
}
} else {
--
Roland Dreier <rolandd@cisco.com> || For corporate legal information go to:
http://www.cisco.com/web/about/doing_business/legal/cri/index.html
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 4/42 v2] drivers/infiniband/hw/nes: Adjust confusing if indentation
[not found] <Pine.LNX.4.64.1008052217430.31692@ask.diku.dk>
2010-08-05 20:31 ` [PATCH 4/42] drivers/infiniband/hw/nes: Adjust confusing if indentation Roland Dreier
@ 2010-08-05 23:48 ` Dan Carpenter
2010-08-06 10:21 ` Tung, Chien Tin
1 sibling, 1 reply; 3+ messages in thread
From: Dan Carpenter @ 2010-08-05 23:48 UTC (permalink / raw)
To: Julia Lawall
Cc: Faisal Latif, Chien Tung, Roland Dreier, Sean Hefty,
Hal Rosenstock, linux-rdma, linux-kernel, kernel-janitors
I think the white space is meant to look like this. I did look at
whether the "sq_cqes = 0;" should only be done if netif_queue_stopped().
In the end I decided this was what was intended, but it would be
better if someone more familiar with the code reviewed it.
Reported-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Dan Carpenter <error27@gmail.com>
---
v2: changed different indents
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
index 57874a1..293977b 100644
--- a/drivers/infiniband/hw/nes/nes_hw.c
+++ b/drivers/infiniband/hw/nes/nes_hw.c
@@ -2737,9 +2737,9 @@ void nes_nic_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq)
nesnic->sq_tail &= nesnic->sq_size-1;
if (sq_cqes > 128) {
barrier();
- /* restart the queue if it had been stopped */
- if (netif_queue_stopped(nesvnic->netdev))
- netif_wake_queue(nesvnic->netdev);
+ /* restart the queue if it had been stopped */
+ if (netif_queue_stopped(nesvnic->netdev))
+ netif_wake_queue(nesvnic->netdev);
sq_cqes = 0;
}
} else {
^ permalink raw reply related [flat|nested] 3+ messages in thread