From: David S. Miller <davem@davemloft.net>
Date: Tue, 18 Dec 2018 07:27:01 +0000 (-0800)
Subject: Merge branch 'net-SO_TIMESTAMPING-fixes'
X-Git-Tag: v4.20~27^2~33
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b33299017ca7a303fa650e007ebfbcf57527fc8c;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'net-SO_TIMESTAMPING-fixes'

Willem de Bruijn says:

====================
net: SO_TIMESTAMPING fixes

Fix two omissions:

- tx timestamping is missing for AF_INET6/SOCK_RAW/IPPROTO_RAW
- SOF_TIMESTAMPING_OPT_ID is missing for IPPROTO_RAW, PF_PACKET, CAN

Discovered while expanding the selftest in

  tools/testing/selftests/networking/timestamping/txtimestamp.c

Will send the test patchset to net-next once the fixes make it to that
branch. For now, it is available at

  https://github.com/wdebruij/linux/commits/txtimestamp-test-1
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

b33299017ca7a303fa650e007ebfbcf57527fc8c