Revert following commits: commit acec05fb78ab ("net_tstamp: Add TIMESTAMPING SOFTWARE and HARDWARE mask") commit 11d55be06df0 ("net: ethtool: Add a command to expose current time stamping layer") commit bb8645b00ced ("netlink: specs: Introduce new netlink command to get current timestamp") commit d905f9c75329 ("net: ethtool: Add a command to list available time stamping layers") commit aed5004ee7a0 ("netlink: specs: Introduce new netlink command to list available time stamping layers") commit 51bdf3165f01 ("net: Replace hwtstamp_source by timestamping layer") commit 0f7f463d4821 ("net: Change the API of PHY default timestamp to MAC") commit 091fab122869 ("net: ethtool: ts: Update GET_TS to reply the current selected timestamp") commit 152c75e1d002 ("net: ethtool: ts: Let the active time stamping layer be selectable") commit ee60ea6be0d3 ("netlink: specs: Introduce time stamping set command") They need more time for reviews.
Showing the changes to include/uapi (2 of 23 files). Show all
Unified · Split
| @@ -57,9 +57,6 @@ enum { · 56 unmodified lines | ||
| 57 | 57 | ETHTOOL_MSG_PLCA_GET_STATUS, |
| 58 | 58 | ETHTOOL_MSG_MM_GET, |
| 59 | 59 | ETHTOOL_MSG_MM_SET, |
| 60 | − ETHTOOL_MSG_TS_GET, | |
| 61 | − ETHTOOL_MSG_TS_LIST_GET, | |
| 62 | − ETHTOOL_MSG_TS_SET, | |
| 63 | 60 | |
| 64 | 61 | /* add new constants above here */ |
| 65 | 62 | __ETHTOOL_MSG_USER_CNT, |
| @@ -112,8 +109,6 @@ enum { · 46 unmodified lines | ||
| 112 | 109 | ETHTOOL_MSG_PLCA_NTF, |
| 113 | 110 | ETHTOOL_MSG_MM_GET_REPLY, |
| 114 | 111 | ETHTOOL_MSG_MM_NTF, |
| 115 | − ETHTOOL_MSG_TS_GET_REPLY, | |
| 116 | − ETHTOOL_MSG_TS_LIST_GET_REPLY, | |
| 117 | 112 | |
| 118 | 113 | /* add new constants above here */ |
| 119 | 114 | __ETHTOOL_MSG_KERNEL_CNT, |
| @@ -980,30 +975,6 @@ enum { · 860 unmodified lines | ||
| 980 | 975 | ETHTOOL_A_MM_MAX = (__ETHTOOL_A_MM_CNT - 1) |
| 981 | 976 | }; |
| 982 | 977 | |
| 983 | −/* TS LAYER */ | |
| 984 | − | |
| 985 | −enum { | |
| 986 | − ETHTOOL_A_TS_UNSPEC, | |
| 987 | − ETHTOOL_A_TS_HEADER, /* nest - _A_HEADER_* */ | |
| 988 | − ETHTOOL_A_TS_LAYER, /* u32 */ | |
| 989 | − | |
| 990 | − /* add new constants above here */ | |
| 991 | − __ETHTOOL_A_TS_CNT, | |
| 992 | − ETHTOOL_A_TS_MAX = (__ETHTOOL_A_TS_CNT - 1) | |
| 993 | −}; | |
| 994 | − | |
| 995 | −/* TS LIST LAYER */ | |
| 996 | − | |
| 997 | −enum { | |
| 998 | − ETHTOOL_A_TS_LIST_UNSPEC, | |
| 999 | − ETHTOOL_A_TS_LIST_HEADER, /* nest - _A_HEADER_* */ | |
| 1000 | − ETHTOOL_A_TS_LIST_LAYER, /* array, u32 */ | |
| 1001 | − | |
| 1002 | − /* add new constants above here */ | |
| 1003 | − __ETHTOOL_A_TS_LIST_CNT, | |
| 1004 | − ETHTOOL_A_TS_LIST_MAX = (__ETHTOOL_A_TS_LIST_CNT - 1) | |
| 1005 | −}; | |
| 1006 | − | |
| 1007 | 978 | /* generic netlink info */ |
| 1008 | 979 | #define ETHTOOL_GENL_NAME "ethtool" |
| 1009 | 980 | #define ETHTOOL_GENL_VERSION 1 |
| @@ -13,16 +13,6 @@ · 12 unmodified lines | ||
| 13 | 13 | #include <linux/types.h> |
| 14 | 14 | #include <linux/socket.h> /* for SO_TIMESTAMPING */ |
| 15 | 15 | |
| 16 | −/* Layer of the TIMESTAMPING provider */ | |
| 17 | −enum timestamping_layer { | |
| 18 | − NO_TIMESTAMPING, | |
| 19 | − SOFTWARE_TIMESTAMPING, | |
| 20 | − MAC_TIMESTAMPING, | |
| 21 | − PHY_TIMESTAMPING, | |
| 22 | − | |
| 23 | − __TIMESTAMPING_COUNT, | |
| 24 | −}; | |
| 25 | − | |
| 26 | 16 | /* SO_TIMESTAMPING flags */ |
| 27 | 17 | enum { |
| 28 | 18 | SOF_TIMESTAMPING_TX_HARDWARE = (1<<0), |
| @@ -58,14 +48,6 @@ enum { · 29 unmodified lines | ||
| 58 | 48 | SOF_TIMESTAMPING_TX_SCHED | \ |
| 59 | 49 | SOF_TIMESTAMPING_TX_ACK) |
| 60 | 50 | |
| 61 | −#define SOF_TIMESTAMPING_SOFTWARE_MASK (SOF_TIMESTAMPING_RX_SOFTWARE | \ | |
| 62 | − SOF_TIMESTAMPING_TX_SOFTWARE | \ | |
| 63 | − SOF_TIMESTAMPING_SOFTWARE) | |
| 64 | − | |
| 65 | −#define SOF_TIMESTAMPING_HARDWARE_MASK (SOF_TIMESTAMPING_RX_HARDWARE | \ | |
| 66 | − SOF_TIMESTAMPING_TX_HARDWARE | \ | |
| 67 | − SOF_TIMESTAMPING_RAW_HARDWARE) | |
| 68 | − | |
| 69 | 51 | /** |
| 70 | 52 | * struct so_timestamping - SO_TIMESTAMPING parameter |
| 71 | 53 | * |