aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/via-rhine.c
diff options
context:
space:
mode:
authorGreg KH <greg@press.(none)>2005-06-28 01:07:56 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-06-28 01:07:56 -0400
commit8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb (patch)
treec43b6c2fdf1b68b66906a2de69446dcec0f9af6b /drivers/net/via-rhine.c
parent1cde8a16815bd85c8137d1ea556398983c597c11 (diff)
parent99f95e5286df2f69edab8a04c7080d986ee4233b (diff)
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/via-rhine.c')
-rw-r--r--drivers/net/via-rhine.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index 16212e69a49e..eb0e7bd4dcf8 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -1398,7 +1398,7 @@ static void rhine_tx(struct net_device *dev)
1398 while (rp->dirty_tx != rp->cur_tx) { 1398 while (rp->dirty_tx != rp->cur_tx) {
1399 txstatus = le32_to_cpu(rp->tx_ring[entry].tx_status); 1399 txstatus = le32_to_cpu(rp->tx_ring[entry].tx_status);
1400 if (debug > 6) 1400 if (debug > 6)
1401 printk(KERN_DEBUG " Tx scavenge %d status %8.8x.\n", 1401 printk(KERN_DEBUG "Tx scavenge %d status %8.8x.\n",
1402 entry, txstatus); 1402 entry, txstatus);
1403 if (txstatus & DescOwn) 1403 if (txstatus & DescOwn)
1404 break; 1404 break;
@@ -1469,7 +1469,7 @@ static void rhine_rx(struct net_device *dev)
1469 int data_size = desc_status >> 16; 1469 int data_size = desc_status >> 16;
1470 1470
1471 if (debug > 4) 1471 if (debug > 4)
1472 printk(KERN_DEBUG " rhine_rx() status is %8.8x.\n", 1472 printk(KERN_DEBUG "rhine_rx() status is %8.8x.\n",
1473 desc_status); 1473 desc_status);
1474 if (--boguscnt < 0) 1474 if (--boguscnt < 0)
1475 break; 1475 break;
@@ -1487,7 +1487,7 @@ static void rhine_rx(struct net_device *dev)
1487 } else if (desc_status & RxErr) { 1487 } else if (desc_status & RxErr) {
1488 /* There was a error. */ 1488 /* There was a error. */
1489 if (debug > 2) 1489 if (debug > 2)
1490 printk(KERN_DEBUG " rhine_rx() Rx " 1490 printk(KERN_DEBUG "rhine_rx() Rx "
1491 "error was %8.8x.\n", 1491 "error was %8.8x.\n",
1492 desc_status); 1492 desc_status);
1493 rp->stats.rx_errors++; 1493 rp->stats.rx_errors++;