projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'i2c/for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
[cascardo/linux.git]
/
drivers
/
net
/
appletalk
/
cops.c
diff --git
a/drivers/net/appletalk/cops.c
b/drivers/net/appletalk/cops.c
index
7f2a032
..
1b2e921
100644
(file)
--- a/
drivers/net/appletalk/cops.c
+++ b/
drivers/net/appletalk/cops.c
@@
-861,7
+861,7
@@
static void cops_timeout(struct net_device *dev)
}
printk(KERN_WARNING "%s: Transmit timed out.\n", dev->name);
cops_jumpstart(dev); /* Restart the card. */
}
printk(KERN_WARNING "%s: Transmit timed out.\n", dev->name);
cops_jumpstart(dev); /* Restart the card. */
-
dev->trans_start = jiffies
; /* prevent tx timeout */
+
netif_trans_update(dev)
; /* prevent tx timeout */
netif_wake_queue(dev);
}
netif_wake_queue(dev);
}