diff options
Diffstat (limited to 'drivers/net/hamachi.c')
-rw-r--r-- | drivers/net/hamachi.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c index 83f43bb835d6..61f2b1cfcd46 100644 --- 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 | |||
859 | for (i = 10000; i >= 0; i--) | 859 | for (i = 10000; i >= 0; i--) |
860 | if ((readw(ioaddr + MII_Status) & 1) == 0) | 860 | if ((readw(ioaddr + MII_Status) & 1) == 0) |
861 | break; | 861 | break; |
862 | return; | ||
863 | } | 862 | } |
864 | 863 | ||
865 | 864 | ||
@@ -1225,8 +1224,6 @@ static void hamachi_init_ring(struct net_device *dev) | |||
1225 | } | 1224 | } |
1226 | /* Mark the last entry of the ring */ | 1225 | /* Mark the last entry of the ring */ |
1227 | hmp->tx_ring[TX_RING_SIZE-1].status_n_length |= cpu_to_le32(DescEndRing); | 1226 | hmp->tx_ring[TX_RING_SIZE-1].status_n_length |= cpu_to_le32(DescEndRing); |
1228 | |||
1229 | return; | ||
1230 | } | 1227 | } |
1231 | 1228 | ||
1232 | 1229 | ||