aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wan/farsync.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/wan/farsync.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/wan/farsync.c')
-rw-r--r--drivers/net/wan/farsync.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index beda387f2fc..9bc2e364915 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -1346,8 +1346,8 @@ do_bottom_half_tx(struct fst_card_info *card)
1346 1346
1347 dev = port_to_dev(port); 1347 dev = port_to_dev(port);
1348 while (!(FST_RDB(card, txDescrRing[pi][port->txpos].bits) & 1348 while (!(FST_RDB(card, txDescrRing[pi][port->txpos].bits) &
1349 DMA_OWN) 1349 DMA_OWN) &&
1350 && !(card->dmatx_in_progress)) { 1350 !(card->dmatx_in_progress)) {
1351 /* 1351 /*
1352 * There doesn't seem to be a txdone event per-se 1352 * There doesn't seem to be a txdone event per-se
1353 * We seem to have to deduce it, by checking the DMA_OWN 1353 * We seem to have to deduce it, by checking the DMA_OWN
@@ -1379,8 +1379,8 @@ do_bottom_half_tx(struct fst_card_info *card)
1379 */ 1379 */
1380 FST_WRW(card, txDescrRing[pi][port->txpos].bcnt, 1380 FST_WRW(card, txDescrRing[pi][port->txpos].bcnt,
1381 cnv_bcnt(skb->len)); 1381 cnv_bcnt(skb->len));
1382 if ((skb->len < FST_MIN_DMA_LEN) 1382 if ((skb->len < FST_MIN_DMA_LEN) ||
1383 || (card->family == FST_FAMILY_TXP)) { 1383 (card->family == FST_FAMILY_TXP)) {
1384 /* Enqueue the packet with normal io */ 1384 /* Enqueue the packet with normal io */
1385 memcpy_toio(card->mem + 1385 memcpy_toio(card->mem +
1386 BUF_OFFSET(txBuffer[pi] 1386 BUF_OFFSET(txBuffer[pi]
@@ -2030,8 +2030,8 @@ fst_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
2030 /* Sanity check the parameters. We don't support partial writes 2030 /* Sanity check the parameters. We don't support partial writes
2031 * when going over the top 2031 * when going over the top
2032 */ 2032 */
2033 if (wrthdr.size > FST_MEMSIZE || wrthdr.offset > FST_MEMSIZE 2033 if (wrthdr.size > FST_MEMSIZE || wrthdr.offset > FST_MEMSIZE ||
2034 || wrthdr.size + wrthdr.offset > FST_MEMSIZE) { 2034 wrthdr.size + wrthdr.offset > FST_MEMSIZE) {
2035 return -ENXIO; 2035 return -ENXIO;
2036 } 2036 }
2037 2037