diff options
Diffstat (limited to 'drivers/net/fec.c')
-rw-r--r-- | drivers/net/fec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 2b1651aee13f..42d9ac9ba395 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c | |||
@@ -275,8 +275,6 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
275 | | BD_ENET_TX_LAST | BD_ENET_TX_TC); | 275 | | BD_ENET_TX_LAST | BD_ENET_TX_TC); |
276 | bdp->cbd_sc = status; | 276 | bdp->cbd_sc = status; |
277 | 277 | ||
278 | dev->trans_start = jiffies; | ||
279 | |||
280 | /* Trigger transmission start */ | 278 | /* Trigger transmission start */ |
281 | writel(0, fep->hwp + FEC_X_DES_ACTIVE); | 279 | writel(0, fep->hwp + FEC_X_DES_ACTIVE); |
282 | 280 | ||
@@ -1033,7 +1031,7 @@ fec_set_mac_address(struct net_device *dev, void *p) | |||
1033 | (dev->dev_addr[1] << 16) | (dev->dev_addr[0] << 24), | 1031 | (dev->dev_addr[1] << 16) | (dev->dev_addr[0] << 24), |
1034 | fep->hwp + FEC_ADDR_LOW); | 1032 | fep->hwp + FEC_ADDR_LOW); |
1035 | writel((dev->dev_addr[5] << 16) | (dev->dev_addr[4] << 24), | 1033 | writel((dev->dev_addr[5] << 16) | (dev->dev_addr[4] << 24), |
1036 | fep + FEC_ADDR_HIGH); | 1034 | fep->hwp + FEC_ADDR_HIGH); |
1037 | return 0; | 1035 | return 0; |
1038 | } | 1036 | } |
1039 | 1037 | ||