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/atp.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/atp.c')
-rw-r--r-- | drivers/net/atp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/atp.c b/drivers/net/atp.c index 001791775be3..2f8261c9614a 100644 --- a/drivers/net/atp.c +++ b/drivers/net/atp.c | |||
@@ -673,8 +673,8 @@ static irqreturn_t atp_interrupt(int irq, void *dev_instance) | |||
673 | netif_wake_queue(dev); /* Inform upper layers. */ | 673 | netif_wake_queue(dev); /* Inform upper layers. */ |
674 | } | 674 | } |
675 | num_tx_since_rx++; | 675 | num_tx_since_rx++; |
676 | } else if (num_tx_since_rx > 8 | 676 | } else if (num_tx_since_rx > 8 && |
677 | && time_after(jiffies, dev->last_rx + HZ)) { | 677 | time_after(jiffies, dev->last_rx + HZ)) { |
678 | if (net_debug > 2) | 678 | if (net_debug > 2) |
679 | printk(KERN_DEBUG "%s: Missed packet? No Rx after %d Tx and " | 679 | printk(KERN_DEBUG "%s: Missed packet? No Rx after %d Tx and " |
680 | "%ld jiffies status %02x CMR1 %02x.\n", dev->name, | 680 | "%ld jiffies status %02x CMR1 %02x.\n", dev->name, |