tree e40f35dc20a9d45d774b78b9d42e2f4b0e8b2a64
parent 255fe81a6ad420258b6dac8c509c99cd1c233390
parent 8f932f762e7928d250e21006b00ff9b7718b0a64
author David S. Miller <davem@davemloft.net> 1545118021 -0800
committer David S. Miller <davem@davemloft.net> 1545118021 -0800

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>