projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'slab/align', 'slab/cleanups', 'slab/fixes', 'slab/memhotadd' and...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
arcnet
/
arcnet.c
diff --git
a/drivers/net/arcnet/arcnet.c
b/drivers/net/arcnet/arcnet.c
index d8f029303754a76c4feae384986b2b6efbc21ca1..a746ba272f04b5e3b77a4e45f65809a398c73585 100644
(file)
--- a/
drivers/net/arcnet/arcnet.c
+++ b/
drivers/net/arcnet/arcnet.c
@@
-654,7
+654,6
@@
netdev_tx_t arcnet_send_packet(struct sk_buff *skb,
}
}
retval = NETDEV_TX_OK;
- dev->trans_start = jiffies;
lp->next_tx = txbuf;
} else {
retval = NETDEV_TX_BUSY;