aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/atarilance.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/atarilance.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/atarilance.c')
-rw-r--r--drivers/net/atarilance.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index 0c0deceb6938..c5721cb38265 100644
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -930,8 +930,8 @@ static irqreturn_t lance_interrupt( int irq, void *dev_id )
930 } 930 }
931#endif 931#endif
932 932
933 if (lp->tx_full && (netif_queue_stopped(dev)) 933 if (lp->tx_full && (netif_queue_stopped(dev)) &&
934 && dirty_tx > lp->cur_tx - TX_RING_SIZE + 2) { 934 dirty_tx > lp->cur_tx - TX_RING_SIZE + 2) {
935 /* The ring is no longer full, clear tbusy. */ 935 /* The ring is no longer full, clear tbusy. */
936 lp->tx_full = 0; 936 lp->tx_full = 0;
937 netif_wake_queue (dev); 937 netif_wake_queue (dev);