summaryrefslogtreecommitdiff
path: root/net/core/secure_seq.c
diff options
context:
space:
mode:
authorIvan Khoronzhuk <ivan.khoronzhuk@linaro.org>2017-02-07 00:53:45 +0200
committerDavid S. Miller <davem@davemloft.net>2017-02-07 13:36:53 -0500
commit219189e764be35372c298bee6492fc4c870b6ffd (patch)
tree7fd5c87eaa495009247ac497ad65b210f1d2d08a /net/core/secure_seq.c
parent919ce2a4f7487fea577131957448a457eb14d277 (diff)
net: ethernet: ti: cpsw: remove netif_trans_update
No need to update jiffies in txq->trans_start twice, it's supposed to be done in netdev_start_xmit() and anyway is re-written. Also, no reason to update trans time in case of an error. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/secure_seq.c')
0 files changed, 0 insertions, 0 deletions
vate-remove&id=3efa70d78f218e4c9276b0bac0545e5184c1c47b&id2=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/firewire/oxfw/oxfw.h')