diff options
| author | David S. Miller <davem@davemloft.net> | 2014-07-29 11:40:07 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-29 11:40:25 -0700 |
| commit | 9d7e3ea73c6be20538a69c14ab8bfb3b36f8d1a8 (patch) | |
| tree | 2915bc3a3e8ea825e7b02349b05915aaff8a91eb /include/uapi/linux | |
| parent | 13e9b9972fa0f34059e737ae215a26e43966b46f (diff) | |
| parent | 4d276eb6a478307a28ae843836c455bf04b37a3c (diff) | |
Merge branch 'syststamp-removal'
Willem de Bruijn says:
====================
net: remove deprecated syststamp
The network stack can generate two kinds of hardware timestamps:
- hwtstamp stores a hw timestamp in device-specific raw format
- syststamp convers the raw format to system time
The second is deprecated and only implemented by a single device
driver. The suggested alternative is to communicate hwtstamp +
directly expose the NIC PTP clock device through ptp_clock_info.
The remaining driver (octeon) does not expose such a standard
interface as of now. It does have its own PTP library that depends
on its own shared memory PTP clock interface.
This patchset
1. reverts the syststamp code in the one driver (octeon)
2. reverts an unnecessary zero initialization in another (vxge)
3. modifies PF_PACKET to use syststamp is != 0 (because always == 0)
4. modifies SCM_TIMESTAMPING in the same way
For backwards compatibility, the interfaces are not removed.
Applications can still request SOF_TIMESTAMPING_SYS_HARDWARE. The
response field in scm_timestamping also remains. As was the case
for hardware/drivers that did not implement the feature, the
setsockopt succeeds, but the response field is always zero.
====================
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/if_packet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/if_packet.h b/include/uapi/linux/if_packet.h index bac27fa05f5b..da2d668b8cf1 100644 --- a/include/uapi/linux/if_packet.h +++ b/include/uapi/linux/if_packet.h @@ -108,7 +108,7 @@ struct tpacket_auxdata { /* Rx and Tx ring - header status */ #define TP_STATUS_TS_SOFTWARE (1 << 29) -#define TP_STATUS_TS_SYS_HARDWARE (1 << 30) +#define TP_STATUS_TS_SYS_HARDWARE (1 << 30) /* deprecated, never set */ #define TP_STATUS_TS_RAW_HARDWARE (1 << 31) /* Rx ring - feature request bits */ |
