Merge tag 'usb-serial-4.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-zesty-kernel.git] / net / sched / sch_netem.c

diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index b7e4097bfdab22dc0f43b314aadf3c001cc3b24f..bcfadfdea8e0928ba6f9615e919c5411dfd948d3 100644 (file)
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -627,7 +627,7 @@ deliver:
                         * from the network (tstamp will be updated).
                         */
                        if (G_TC_FROM(skb->tc_verd) & AT_INGRESS)
-                               skb->tstamp.tv64 = 0;
+                               skb->tstamp = 0;
 #endif
 
                        if (q->qdisc) {