diff options
author | Joe Perches <joe@perches.com> | 2009-12-03 02:58:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-03 16:18:01 -0500 |
commit | 8e95a2026f3b43f7c3d676adaccd2de9532e8dcc (patch) | |
tree | 3733318168cd512480b6db58c5c16d1c8847f0b7 /drivers/net/mace.c | |
parent | 3454f835837609d60b29a266e3bd9d701073b060 (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/mace.c')
-rw-r--r-- | drivers/net/mace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/mace.c b/drivers/net/mace.c index 7d7577b598ea..d9fbad386389 100644 --- a/drivers/net/mace.c +++ b/drivers/net/mace.c | |||
@@ -897,8 +897,8 @@ static irqreturn_t mace_rxdma_intr(int irq, void *dev_id) | |||
897 | if (next >= N_RX_RING) | 897 | if (next >= N_RX_RING) |
898 | next = 0; | 898 | next = 0; |
899 | np = mp->rx_cmds + next; | 899 | np = mp->rx_cmds + next; |
900 | if (next != mp->rx_fill | 900 | if (next != mp->rx_fill && |
901 | && (ld_le16(&np->xfer_status) & ACTIVE) != 0) { | 901 | (ld_le16(&np->xfer_status) & ACTIVE) != 0) { |
902 | printk(KERN_DEBUG "mace: lost a status word\n"); | 902 | printk(KERN_DEBUG "mace: lost a status word\n"); |
903 | ++mace_lost_status; | 903 | ++mace_lost_status; |
904 | } else | 904 | } else |