projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'libnvdimm-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm...
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
hp
/
hp100.c
diff --git
a/drivers/net/ethernet/hp/hp100.c
b/drivers/net/ethernet/hp/hp100.c
index
3daf2d4
..
631dbc7
100644
(file)
--- a/
drivers/net/ethernet/hp/hp100.c
+++ b/
drivers/net/ethernet/hp/hp100.c
@@
-1102,7
+1102,7
@@
static int hp100_open(struct net_device *dev)
return -EAGAIN;
}
-
dev->trans_start = jiffies
; /* prevent tx timeout */
+
netif_trans_update(dev)
; /* prevent tx timeout */
netif_start_queue(dev);
lp->lan_type = hp100_sense_lan(dev);