diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-15 01:57:39 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-15 01:57:39 +0300 |
| commit | 5082a7df5251b361be8f8edc1f0a148d07999820 (patch) | |
| tree | 730e1c38a6d304284f0c451faa7273de8aeca70b /net/sched/sch_netem.c | |
| parent | 432798195bbce1f8cd33d1c0284d0538835e25fb (diff) | |
| parent | 1decef370456870bf448a565be95db636428e106 (diff) | |
| download | linux-5082a7df5251b361be8f8edc1f0a148d07999820.tar.xz | |
Merge tag 'gnss-4.20-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss into char-misc-linus
Johan writes:
GNSS fixes for v4.20-rc3
The two serdev drivers were using the wrong timeout argument when
expecting the serdev_device_write() helper to wait indefinitely,
something which could result in incomplete writes when the controller
write buffer was getting full.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'net/sched/sch_netem.c')
| -rw-r--r-- | net/sched/sch_netem.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index 57b3ad9394ad..2c38e3d07924 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -648,15 +648,6 @@ deliver: */ skb->dev = qdisc_dev(sch); -#ifdef CONFIG_NET_CLS_ACT - /* - * If it's at ingress let's pretend the delay is - * from the network (tstamp will be updated). - */ - if (skb->tc_redirected && skb->tc_from_ingress) - skb->tstamp = 0; -#endif - if (q->slot.slot_next) { q->slot.packets_left--; q->slot.bytes_left -= qdisc_pkt_len(skb); |