diff options
Diffstat (limited to 'drivers/net/declance.c')
-rw-r--r-- | drivers/net/declance.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/declance.c b/drivers/net/declance.c index 8cf3cc6f20e..1d973db27c3 100644 --- a/drivers/net/declance.c +++ b/drivers/net/declance.c | |||
@@ -874,7 +874,7 @@ static inline int lance_reset(struct net_device *dev) | |||
874 | 874 | ||
875 | lance_init_ring(dev); | 875 | lance_init_ring(dev); |
876 | load_csrs(lp); | 876 | load_csrs(lp); |
877 | dev->trans_start = jiffies; | 877 | dev->trans_start = jiffies; /* prevent tx timeout */ |
878 | status = init_restart_lance(lp); | 878 | status = init_restart_lance(lp); |
879 | return status; | 879 | return status; |
880 | } | 880 | } |
@@ -930,7 +930,6 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
930 | 930 | ||
931 | spin_unlock_irqrestore(&lp->lock, flags); | 931 | spin_unlock_irqrestore(&lp->lock, flags); |
932 | 932 | ||
933 | dev->trans_start = jiffies; | ||
934 | dev_kfree_skb(skb); | 933 | dev_kfree_skb(skb); |
935 | 934 | ||
936 | return NETDEV_TX_OK; | 935 | return NETDEV_TX_OK; |
@@ -940,7 +939,7 @@ static void lance_load_multicast(struct net_device *dev) | |||
940 | { | 939 | { |
941 | struct lance_private *lp = netdev_priv(dev); | 940 | struct lance_private *lp = netdev_priv(dev); |
942 | volatile u16 *ib = (volatile u16 *)dev->mem_start; | 941 | volatile u16 *ib = (volatile u16 *)dev->mem_start; |
943 | struct dev_mc_list *dmi; | 942 | struct netdev_hw_addr *ha; |
944 | char *addrs; | 943 | char *addrs; |
945 | u32 crc; | 944 | u32 crc; |
946 | 945 | ||
@@ -959,8 +958,8 @@ static void lance_load_multicast(struct net_device *dev) | |||
959 | *lib_ptr(ib, filter[3], lp->type) = 0; | 958 | *lib_ptr(ib, filter[3], lp->type) = 0; |
960 | 959 | ||
961 | /* Add addresses */ | 960 | /* Add addresses */ |
962 | netdev_for_each_mc_addr(dmi, dev) { | 961 | netdev_for_each_mc_addr(ha, dev) { |
963 | addrs = dmi->dmi_addr; | 962 | addrs = ha->addr; |
964 | 963 | ||
965 | /* multicast address? */ | 964 | /* multicast address? */ |
966 | if (!(*addrs & 1)) | 965 | if (!(*addrs & 1)) |
@@ -970,7 +969,6 @@ static void lance_load_multicast(struct net_device *dev) | |||
970 | crc = crc >> 26; | 969 | crc = crc >> 26; |
971 | *lib_ptr(ib, filter[crc >> 4], lp->type) |= 1 << (crc & 0xf); | 970 | *lib_ptr(ib, filter[crc >> 4], lp->type) |= 1 << (crc & 0xf); |
972 | } | 971 | } |
973 | return; | ||
974 | } | 972 | } |
975 | 973 | ||
976 | static void lance_set_multicast(struct net_device *dev) | 974 | static void lance_set_multicast(struct net_device *dev) |