diff --git a/[refs] b/[refs] index 318b0c08b4d6..1bb3909f6139 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49b3fd4aff7ede794d4fe50b80095eb33cc9d911 +refs/heads/master: 3ce23fa9780b70525932c5e4b5ac401c67390fae diff --git a/trunk/include/linux/net_tstamp.h b/trunk/include/linux/net_tstamp.h index a3b8546354ac..3df0984cd0d5 100644 --- a/trunk/include/linux/net_tstamp.h +++ b/trunk/include/linux/net_tstamp.h @@ -60,6 +60,15 @@ enum { * before sending the packet. */ HWTSTAMP_TX_ON, + + /* + * Enables time stamping for outgoing packets just as + * HWTSTAMP_TX_ON does, but also enables time stamp insertion + * directly into Sync packets. In this case, transmitted Sync + * packets will not received a time stamp via the socket error + * queue. + */ + HWTSTAMP_TX_ONESTEP_SYNC, }; /* possible values for hwtstamp_config->rx_filter */