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
skge: use the DMA state API instead of the pci equivalents
[safe/jmp/linux-2.6]
/
drivers
/
net
/
hamachi.c
diff --git
a/drivers/net/hamachi.c
b/drivers/net/hamachi.c
index
83f43bb
..
61f2b1c
100644
(file)
--- a/
drivers/net/hamachi.c
+++ b/
drivers/net/hamachi.c
@@
-859,7
+859,6
@@
static void mdio_write(struct net_device *dev, int phy_id, int location, int val
for (i = 10000; i >= 0; i--)
if ((readw(ioaddr + MII_Status) & 1) == 0)
break;
- return;
}
@@
-1225,8
+1224,6
@@
static void hamachi_init_ring(struct net_device *dev)
}
/* Mark the last entry of the ring */
hmp->tx_ring[TX_RING_SIZE-1].status_n_length |= cpu_to_le32(DescEndRing);
-
- return;
}