projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
[deliverable/linux.git]
/
drivers
/
net
/
ethernet
/
ti
/
tlan.c
diff --git
a/drivers/net/ethernet/ti/tlan.c
b/drivers/net/ethernet/ti/tlan.c
index a274cd49afe954442bbd3bf647be71a92d0087ee..561703317312e2bbcc1047eeb7f2271b0895be7a 100644
(file)
--- a/
drivers/net/ethernet/ti/tlan.c
+++ b/
drivers/net/ethernet/ti/tlan.c
@@
-1007,7
+1007,7
@@
static void tlan_tx_timeout(struct net_device *dev)
tlan_reset_lists(dev);
tlan_read_and_clear_stats(dev, TLAN_IGNORE);
tlan_reset_adapter(dev);
-
dev->trans_start = jiffies
; /* prevent tx timeout */
+
netif_trans_update(dev)
; /* prevent tx timeout */
netif_wake_queue(dev);
}
This page took
0.030958 seconds
and
5
git commands to generate.