Eric Dumazet d3fbff306c sock: correctly test SOCK_TIMESTAMP in sock_recv_ts_and_drops() ...

It seems the code does not match the intent.

This broke packetdrill, and probably other programs.

Fixes: 6c7c98bad4 ("sock: avoid dirtying sk_stamp, if possible")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Paolo Abeni <pabeni@redhat.com>
Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2017-04-02 19:34:55 -07:00

..

acpi

Merge branches 'acpi-bus', 'acpi-sleep' and 'acpi-processor'

2017-02-20 14:28:03 +01:00

asm-generic

mm: convert generic code to 5-level paging

2017-03-09 11:48:47 -08:00

clocksource

…

crypto

net: Work around lockdep limitation in sockets that use sockets

2017-03-09 18:23:27 -08:00

drm

sched/headers: Prepare to remove the <linux/mm_types.h> dependency from <linux/sched.h>

2017-03-02 08:42:37 +01:00

dt-bindings

scripts/spelling.txt: add "overide" pattern and fix typo instances

2017-03-09 17:01:09 -08:00

keys

KEYS: Differentiate uses of rcu_dereference_key() and user_key_payload()

2017-03-02 10:09:00 +11:00

kvm

KVM: arm/arm64: Emulate the EL1 phys timer registers

2017-02-08 15:13:37 +00:00

linux

udp: use sk_protocol instead of pcflag to detect udplite sockets

2017-04-01 20:11:36 -07:00

math-emu

…

media

Merge tag 'media/v4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2017-03-09 15:50:56 -08:00

memory

…

misc

…

net

sock: correctly test SOCK_TIMESTAMP in sock_recv_ts_and_drops()

2017-04-02 19:34:55 -07:00

pcmcia

…

ras

…

rdma

sched/headers: Prepare to remove <linux/cred.h> inclusion from <linux/sched.h>

2017-03-02 08:42:31 +01:00

rxrpc

…

scsi

scsi: mpt3sas: Avoid sleeping in interrupt context

2017-03-01 21:52:13 -05:00

soc

Merge tag 'arc-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

2017-02-22 10:33:53 -08:00

sound

sched/headers: Prepare to remove spurious <linux/sched.h> inclusion dependencies

2017-03-02 08:42:41 +01:00

target

target: fix ALUA transition timeout handling

2017-03-18 14:47:28 -07:00

trace

Merge tag 'trace-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

2017-03-07 09:37:28 -08:00

uapi

bpf: introduce BPF_PROG_TEST_RUN command

2017-04-01 12:45:57 -07:00

video

drm/exynos/decon5433: signal vblank only on odd fields

2017-02-07 13:52:52 +09:00

xen

Merge branch 'stable/for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb

2017-03-07 10:23:17 -08:00

Kbuild

…