Remove useless option selecting layer 2 time stamping.

Now that the code automatically falls back to transport-specific time
stamping, this option is no longer needed.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Acked-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Jiri Benc <jbenc@redhat.com>
master
Richard Cochran 2012-10-25 21:02:34 +02:00
parent 870873c7a7
commit ebe6a24bd7
7 changed files with 1 additions and 15 deletions

View File

@ -209,10 +209,6 @@ static void scan_global_line(const char *s, struct config *cfg)
if (val > 0)
*cfg->tx_timestamp_retries = val;
} else if (1 == sscanf(s, " rx_timestamp_l2only %u", &val)) {
*cfg->rx_timestamp_l2only = val ? 1 : 0;
} else if (1 == sscanf(s, " pi_proportional_const %lf", &df)) {
if (df > 0.0 && df < 1.0)

View File

@ -60,7 +60,6 @@ struct config {
struct port_defaults pod;
int *assume_two_step;
int *tx_timestamp_retries;
int *rx_timestamp_l2only;
enum servo_type clock_servo;

View File

@ -28,7 +28,6 @@ logging_level 6
path_trace_enabled 0
follow_up_info 0
tx_timestamp_retries 2
rx_timestamp_l2only 0
use_syslog 1
verbose 0
#

View File

@ -27,7 +27,6 @@ logging_level 6
path_trace_enabled 1
follow_up_info 1
tx_timestamp_retries 2
rx_timestamp_l2only 1
use_syslog 1
verbose 0
#

View File

@ -68,7 +68,6 @@ static struct config cfg_settings = {
.assume_two_step = &assume_two_step,
.tx_timestamp_retries = &sk_tx_retries,
.rx_timestamp_l2only = &sk_prefer_layer2,
.clock_servo = CLOCK_SERVO_PI,

2
sk.c
View File

@ -32,7 +32,7 @@
/* globals */
int sk_tx_retries = 2, sk_prefer_layer2 = 0;
int sk_tx_retries = 2;
/* private methods */

6
sk.h
View File

@ -76,10 +76,4 @@ int sk_timestamping_init(int fd, char *device, enum timestamp_type type,
*/
extern int sk_tx_retries;
/**
* Request the hardware receive filter that is limited to layer 2 time
* stamping.
*/
extern int sk_prefer_layer2;
#endif