Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf84a010 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

net: sock: make sock_tx_timestamp void 



Currently, sock_tx_timestamp() always returns 0. The comment that
describes the sock_tx_timestamp() function wrongly says that it
returns an error when an invalid argument is passed (from commit
20d49473, ``net: socket infrastructure for SO_TIMESTAMPING'').
Make the function void, so that we can also remove all the unneeded
if conditions that check for such a _non-existant_ error case in the
output path.

Signed-off-by: default avatarDaniel Borkmann <dborkman@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9d9f163c

include/net/sock.h

+2 −3
Original line number Diff line number Diff line
@@ -2159,10 +2159,9 @@ static inline void sock_recv_ts_and_drops(struct msghdr *msg, struct sock *sk, 
 * @sk:		socket sending this packet

 * @tx_flags:	filled with instructions for time stamping

 *

 * Currently only depends on SOCK_TIMESTAMPING* flags. Returns error code if

 * parameters are invalid.

 * Currently only depends on SOCK_TIMESTAMPING* flags.

 */

extern int sock_tx_timestamp(struct sock *sk, __u8 *tx_flags);

extern void sock_tx_timestamp(struct sock *sk, __u8 *tx_flags);



/**

 * sk_eat_skb - Release a skb if it is no longer needed

net/can/raw.c

+2 −3
Original line number Diff line number Diff line
@@ -711,9 +711,8 @@ static int raw_sendmsg(struct kiocb *iocb, struct socket *sock, 
	err = memcpy_fromiovec(skb_put(skb, size), msg->msg_iov, size);

	if (err < 0)

		goto free_skb;

	err = sock_tx_timestamp(sk, &skb_shinfo(skb)->tx_flags);

	if (err < 0)

		goto free_skb;



	sock_tx_timestamp(sk, &skb_shinfo(skb)->tx_flags);



	skb->dev = dev;

	skb->sk  = sk;

net/ipv4/ping.c

+2 −3
Original line number Diff line number Diff line
@@ -514,9 +514,8 @@ static int ping_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
	ipc.opt = NULL;

	ipc.oif = sk->sk_bound_dev_if;

	ipc.tx_flags = 0;

	err = sock_tx_timestamp(sk, &ipc.tx_flags);

	if (err)

		return err;



	sock_tx_timestamp(sk, &ipc.tx_flags);



	if (msg->msg_controllen) {

		err = ip_cmsg_send(sock_net(sk), msg, &ipc);

net/ipv4/udp.c

+3 −3
Original line number Diff line number Diff line
@@ -902,9 +902,9 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
	ipc.addr = inet->inet_saddr;



	ipc.oif = sk->sk_bound_dev_if;

	err = sock_tx_timestamp(sk, &ipc.tx_flags);

	if (err)

		return err;



	sock_tx_timestamp(sk, &ipc.tx_flags);



	if (msg->msg_controllen) {

		err = ip_cmsg_send(sock_net(sk), msg, &ipc);

		if (err)

net/ipv6/ip6_output.c

+2 −5
Original line number Diff line number Diff line
@@ -1224,11 +1224,8 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to, 
	}



	/* For UDP, check if TX timestamp is enabled */

	if (sk->sk_type == SOCK_DGRAM) {

		err = sock_tx_timestamp(sk, &tx_flags);

		if (err)

			goto error;

	}

	if (sk->sk_type == SOCK_DGRAM)

		sock_tx_timestamp(sk, &tx_flags);



	/*

	 * Let's try using as much space as possible.