Pass transport type to time stamping initialization function.

Signed-off-by: Richard Cochran <[email protected]> Acked-by: Jacob Keller <[email protected]> Tested-by: Jiri Benc <[email protected]>
lmunch · Oct 29, 2012 · 8dde0d3 · 8dde0d3
1 parent 7894339
commit 8dde0d3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/raw.c b/raw.c
@@ -206,7 +206,7 @@ static int raw_open(struct transport *t, char *name,
 	if (gfd < 0)
 		goto no_general;
 
-	if (sk_timestamping_init(efd, name, ts_type))
+	if (sk_timestamping_init(efd, name, ts_type, TRANS_IEEE_802_3))
 		goto no_timestamping;
 
 	fda->fd[FD_EVENT] = efd;

diff --git a/sk.c b/sk.c
@@ -223,7 +223,8 @@ int sk_receive(int fd, void *buf, int buflen,
 	return cnt;
 }
 
-int sk_timestamping_init(int fd, char *device, enum timestamp_type type)
+int sk_timestamping_init(int fd, char *device, enum timestamp_type type,
+			 enum transport_type transport)
 {
 	int flags;
 

diff --git a/sk.h b/sk.h
@@ -61,12 +61,14 @@ int sk_receive(int fd, void *buf, int buflen,
 
 /**
  * Enable time stamping on a given network interface.
- * @param fd      An open socket.
- * @param device  The name of the network interface to configure.
- * @param type    The requested flavor of time stamping.
- * @return        Zero on success, non-zero otherwise.
+ * @param fd          An open socket.
+ * @param device      The name of the network interface to configure.
+ * @param type        The requested flavor of time stamping.
+ * @param transport   The type of transport used.
+ * @return            Zero on success, non-zero otherwise.
  */
-int sk_timestamping_init(int fd, char *device, enum timestamp_type type);
+int sk_timestamping_init(int fd, char *device, enum timestamp_type type,
+			 enum transport_type transport);
 
 /**
  * Limits the number of RECVMSG(2) calls when attempting to obtain a

diff --git a/udp.c b/udp.c
@@ -155,7 +155,7 @@ static int udp_open(struct transport *t, char *name, struct fdarray *fda,
 	if (gfd < 0)
 		goto no_general;
 
-	if (sk_timestamping_init(efd, name, ts_type))
+	if (sk_timestamping_init(efd, name, ts_type, TRANS_UDP_IPV4))
 		goto no_timestamping;
 
 	fda->fd[FD_EVENT] = efd;

diff --git a/udp6.c b/udp6.c
@@ -154,7 +154,7 @@ static int udp6_open(struct transport *t, char *name, struct fdarray *fda,
 	if (gfd < 0)
 		goto no_general;
 
-	if (sk_timestamping_init(efd, name, ts_type))
+	if (sk_timestamping_init(efd, name, ts_type, TRANS_UDP_IPV6))
 		goto no_timestamping;
 
 	fda->fd[FD_EVENT] = efd;