diff options
Diffstat (limited to 'drivers/net/sunlance.c')
-rw-r--r-- | drivers/net/sunlance.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c index 0fc014ef9e98..7d9c33dd9d1a 100644 --- a/drivers/net/sunlance.c +++ b/drivers/net/sunlance.c | |||
@@ -1003,7 +1003,7 @@ static int lance_reset(struct net_device *dev) | |||
1003 | } | 1003 | } |
1004 | lp->init_ring(dev); | 1004 | lp->init_ring(dev); |
1005 | load_csrs(lp); | 1005 | load_csrs(lp); |
1006 | dev->trans_start = jiffies; | 1006 | dev->trans_start = jiffies; /* prevent tx timeout */ |
1007 | status = init_restart_lance(lp); | 1007 | status = init_restart_lance(lp); |
1008 | return status; | 1008 | return status; |
1009 | } | 1009 | } |
@@ -1054,7 +1054,7 @@ static void lance_piocopy_from_skb(void __iomem *dest, unsigned char *src, int l | |||
1054 | } | 1054 | } |
1055 | src = (char *) p16; | 1055 | src = (char *) p16; |
1056 | break; | 1056 | break; |
1057 | }; | 1057 | } |
1058 | if (len >= 2) { | 1058 | if (len >= 2) { |
1059 | u16 val = src[0] << 8 | src[1]; | 1059 | u16 val = src[0] << 8 | src[1]; |
1060 | sbus_writew(val, piobuf); | 1060 | sbus_writew(val, piobuf); |
@@ -1160,7 +1160,6 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1160 | 1160 | ||
1161 | spin_unlock_irq(&lp->lock); | 1161 | spin_unlock_irq(&lp->lock); |
1162 | 1162 | ||
1163 | dev->trans_start = jiffies; | ||
1164 | dev_kfree_skb(skb); | 1163 | dev_kfree_skb(skb); |
1165 | 1164 | ||
1166 | return NETDEV_TX_OK; | 1165 | return NETDEV_TX_OK; |
@@ -1170,7 +1169,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1170 | static void lance_load_multicast(struct net_device *dev) | 1169 | static void lance_load_multicast(struct net_device *dev) |
1171 | { | 1170 | { |
1172 | struct lance_private *lp = netdev_priv(dev); | 1171 | struct lance_private *lp = netdev_priv(dev); |
1173 | struct dev_mc_list *dmi; | 1172 | struct netdev_hw_addr *ha; |
1174 | char *addrs; | 1173 | char *addrs; |
1175 | u32 crc; | 1174 | u32 crc; |
1176 | u32 val; | 1175 | u32 val; |
@@ -1195,8 +1194,8 @@ static void lance_load_multicast(struct net_device *dev) | |||
1195 | return; | 1194 | return; |
1196 | 1195 | ||
1197 | /* Add addresses */ | 1196 | /* Add addresses */ |
1198 | netdev_for_each_mc_addr(dmi, dev) { | 1197 | netdev_for_each_mc_addr(ha, dev) { |
1199 | addrs = dmi->dmi_addr; | 1198 | addrs = ha->addr; |
1200 | 1199 | ||
1201 | /* multicast address? */ | 1200 | /* multicast address? */ |
1202 | if (!(*addrs & 1)) | 1201 | if (!(*addrs & 1)) |