git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drivers/net/skge.c: Use (pr|netdev)_<level> macro helpers
[safe/jmp/linux-2.6]
/
drivers
/
net
/
atarilance.c
diff --git
a/drivers/net/atarilance.c
b/drivers/net/atarilance.c
index
0c0dece
..
280cfff
100644
(file)
--- a/
drivers/net/atarilance.c
+++ b/
drivers/net/atarilance.c
@@
-663,7
+663,7
@@
static int lance_open( struct net_device *dev )
while (--i > 0)
if (DREG & CSR0_IDON)
break;
while (--i > 0)
if (DREG & CSR0_IDON)
break;
- if (i < 0 || (DREG & CSR0_ERR)) {
+ if (i <
=
0 || (DREG & CSR0_ERR)) {
DPRINTK( 2, ( "lance_open(): opening %s failed, i=%d, csr0=%04x\n",
dev->name, i, DREG ));
DREG = CSR0_STOP;
DPRINTK( 2, ( "lance_open(): opening %s failed, i=%d, csr0=%04x\n",
dev->name, i, DREG ));
DREG = CSR0_STOP;
@@
-930,8
+930,8
@@
static irqreturn_t lance_interrupt( int irq, void *dev_id )
}
#endif
}
#endif
- if (lp->tx_full && (netif_queue_stopped(dev))
-
&&
dirty_tx > lp->cur_tx - TX_RING_SIZE + 2) {
+ if (lp->tx_full && (netif_queue_stopped(dev))
&&
+ dirty_tx > lp->cur_tx - TX_RING_SIZE + 2) {
/* The ring is no longer full, clear tbusy. */
lp->tx_full = 0;
netif_wake_queue (dev);
/* The ring is no longer full, clear tbusy. */
lp->tx_full = 0;
netif_wake_queue (dev);
@@
-1097,7
+1097,7
@@
static void set_multicast_list( struct net_device *dev )
REGA( CSR15 ) = 0x8000; /* Set promiscuous mode */
} else {
short multicast_table[4];
REGA( CSR15 ) = 0x8000; /* Set promiscuous mode */
} else {
short multicast_table[4];
- int num_addrs =
dev->mc_count
;
+ int num_addrs =
netdev_mc_count(dev)
;
int i;
/* We don't use the multicast table, but rely on upper-layer
* filtering. */
int i;
/* We don't use the multicast table, but rely on upper-layer
* filtering. */