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 'media/v4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[cascardo/linux.git]
/
drivers
/
usb
/
gadget
/
function
/
u_ether.c
diff --git
a/drivers/usb/gadget/function/u_ether.c
b/drivers/usb/gadget/function/u_ether.c
index
637809e
..
a3f7e7c
100644
(file)
--- a/
drivers/usb/gadget/function/u_ether.c
+++ b/
drivers/usb/gadget/function/u_ether.c
@@
-597,7
+597,7
@@
static netdev_tx_t eth_start_xmit(struct sk_buff *skb,
DBG(dev, "tx queue err %d\n", retval);
break;
case 0:
- net
->trans_start = jiffies
;
+ net
if_trans_update(net)
;
atomic_inc(&dev->tx_qlen);
}