aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/yellowfin.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/yellowfin.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/yellowfin.c')
-rw-r--r--drivers/net/yellowfin.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index d831dfca0976..0f773a9a3ff2 100644
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -944,8 +944,8 @@ static irqreturn_t yellowfin_interrupt(int irq, void *dev_instance)
944 dev_kfree_skb_irq(skb); 944 dev_kfree_skb_irq(skb);
945 yp->tx_skbuff[entry] = NULL; 945 yp->tx_skbuff[entry] = NULL;
946 } 946 }
947 if (yp->tx_full 947 if (yp->tx_full &&
948 && yp->cur_tx - yp->dirty_tx < TX_QUEUE_SIZE - 4) { 948 yp->cur_tx - yp->dirty_tx < TX_QUEUE_SIZE - 4) {
949 /* The ring is no longer full, clear tbusy. */ 949 /* The ring is no longer full, clear tbusy. */
950 yp->tx_full = 0; 950 yp->tx_full = 0;
951 netif_wake_queue(dev); 951 netif_wake_queue(dev);
@@ -1014,8 +1014,8 @@ static irqreturn_t yellowfin_interrupt(int irq, void *dev_instance)
1014 } 1014 }
1015#endif 1015#endif
1016 1016
1017 if (yp->tx_full 1017 if (yp->tx_full &&
1018 && yp->cur_tx - dirty_tx < TX_QUEUE_SIZE - 2) { 1018 yp->cur_tx - dirty_tx < TX_QUEUE_SIZE - 2) {
1019 /* The ring is no longer full, clear tbusy. */ 1019 /* The ring is no longer full, clear tbusy. */
1020 yp->tx_full = 0; 1020 yp->tx_full = 0;
1021 netif_wake_queue(dev); 1021 netif_wake_queue(dev);