summaryrefslogtreecommitdiffstats
path: root/drivers/firewire
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-06-08 13:02:16 +0200
committerIngo Molnar <mingo@kernel.org>2016-06-08 13:02:16 +0200
commit8e8c668927b029f6ccc350eb1aa936864cc4eb6f (patch)
treef91ec6d49e2b01de5b4b3d517209d13b216a3f0f /drivers/firewire
parentf0133acc7d4835cfbb86393b7d2a4fba7519585b (diff)
parent970442c599b22ccd644ebfe94d1d303bf6f87c05 (diff)
downloadlinux-8e8c668927b029f6ccc350eb1aa936864cc4eb6f.tar.bz2
Merge branch 'x86/urgent' into x86/cpu, to pick up dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/firewire')
-rw-r--r--drivers/firewire/net.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index f4ea80d602f7..309311b1faae 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -1023,7 +1023,7 @@ static int fwnet_send_packet(struct fwnet_packet_task *ptask)
spin_unlock_irqrestore(&dev->lock, flags);
- dev->netdev->trans_start = jiffies;
+ netif_trans_update(dev->netdev);
out:
if (free)
fwnet_free_ptask(ptask);