aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/vxge/vxge-main.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2009-12-03 02:58:21 -0500
committerDavid S. Miller <davem@davemloft.net>2009-12-03 16:18:01 -0500
commit8e95a2026f3b43f7c3d676adaccd2de9532e8dcc (patch)
tree3733318168cd512480b6db58c5c16d1c8847f0b7 /drivers/net/vxge/vxge-main.c
parent3454f835837609d60b29a266e3bd9d701073b060 (diff)
drivers/net: Move && and || to end of previous line
Only files where David Miller is the primary git-signer. wireless, wimax, ixgbe, etc are not modified. Compile tested x86 allyesconfig only Not all files compiled (not x86 compatible) Added a few > 80 column lines, which I ignored. Existing checkpatch complaints ignored. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vxge/vxge-main.c')
-rw-r--r--drivers/net/vxge/vxge-main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index e21358e82c74..f1c4b2a1e867 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -2510,9 +2510,9 @@ static int vxge_add_isr(struct vxgedev *vdev)
2510 } 2510 }
2511 2511
2512 /* Point to next vpath handler */ 2512 /* Point to next vpath handler */
2513 if (((intr_idx + 1) % VXGE_HW_VPATH_MSIX_ACTIVE == 0) 2513 if (((intr_idx + 1) % VXGE_HW_VPATH_MSIX_ACTIVE == 0) &&
2514 && (vp_idx < (vdev->no_of_vpath - 1))) 2514 (vp_idx < (vdev->no_of_vpath - 1)))
2515 vp_idx++; 2515 vp_idx++;
2516 } 2516 }
2517 2517
2518 intr_cnt = vdev->max_vpath_supported * 2; 2518 intr_cnt = vdev->max_vpath_supported * 2;