From: "Steven Rostedt (Google)" <rostedt@xxxxxxxxxxx>
The local and remote port fields are set but never used. Remove them.
Signed-off-by: Steven Rostedt (Google) <rostedt@xxxxxxxxxxx>
---
lib/trace-cmd/include/trace-tsync-local.h | 2 --
lib/trace-cmd/trace-timesync.c | 11 +++--------
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/lib/trace-cmd/include/trace-tsync-local.h b/lib/trace-cmd/include/trace-tsync-local.h
index b357662c8d41..d0f82f5d0916 100644
--- a/lib/trace-cmd/include/trace-tsync-local.h
+++ b/lib/trace-cmd/include/trace-tsync-local.h
@@ -51,9 +51,7 @@ struct clock_sync_context {
/* Identifiers of local and remote time sync peers: cid and port */
unsigned int local_cid;
- unsigned int local_port;
unsigned int remote_cid;
- unsigned int remote_port;
};
int tracecmd_tsync_proto_register(const char *proto_name, int accuracy, int roles,
diff --git a/lib/trace-cmd/trace-timesync.c b/lib/trace-cmd/trace-timesync.c
index 9e82094eaa31..514d333e57a7 100644
--- a/lib/trace-cmd/trace-timesync.c
+++ b/lib/trace-cmd/trace-timesync.c
@@ -405,8 +405,7 @@ int __hidden vsock_get_port(int sd, unsigned int *port)
return 0;
}
-static int get_vsocket_params(int fd, unsigned int *lcid, unsigned int *lport,
- unsigned int *rcid, unsigned int *rport)
+static int get_vsocket_params(int fd, unsigned int *lcid, unsigned int *rcid)
{
struct sockaddr_vm addr;
socklen_t addr_len = sizeof(addr);
@@ -416,7 +415,6 @@ static int get_vsocket_params(int fd, unsigned int *lcid, unsigned int *lport,
return -1;
if (addr.svm_family != AF_VSOCK)
return -1;
- *lport = addr.svm_port;
*lcid = addr.svm_cid;
memset(&addr, 0, sizeof(addr));
@@ -425,7 +423,6 @@ static int get_vsocket_params(int fd, unsigned int *lcid, unsigned int *lport,
return -1;
if (addr.svm_family != AF_VSOCK)
return -1;
- *rport = addr.svm_port;
*rcid = addr.svm_cid;
return 0;
@@ -448,8 +445,7 @@ static int vsock_get_port(int sd, unsigned int *port)
return -ENOTSUP;
}
-static int get_vsocket_params(int fd, unsigned int *lcid, unsigned int *lport,
- unsigned int *rcid, unsigned int *rport)
+static int get_vsocket_params(int fd, unsigned int *lcid, unsigned int *rcid)
{
return -ENOTSUP;
}
@@ -503,8 +499,7 @@ static int clock_context_init(struct tracecmd_time_sync *tsync,
clock->is_server = clock->is_guest;
if (get_vsocket_params(tsync->msg_handle->fd, &clock->local_cid,
- &clock->local_port, &clock->remote_cid,
- &clock->remote_port))
+ &clock->remote_cid))
goto error;
clock->instance = clock_synch_create_instance(tsync->clock_str,
--
2.35.1
|