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
20d4947353
, ``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: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
9d9f163c82
commit
bf84a01063
|
@ -2159,10 +2159,9 @@ static inline void sock_recv_ts_and_drops(struct msghdr *msg, struct sock *sk,
|
||||||
* @sk: socket sending this packet
|
* @sk: socket sending this packet
|
||||||
* @tx_flags: filled with instructions for time stamping
|
* @tx_flags: filled with instructions for time stamping
|
||||||
*
|
*
|
||||||
* Currently only depends on SOCK_TIMESTAMPING* flags. Returns error code if
|
* Currently only depends on SOCK_TIMESTAMPING* flags.
|
||||||
* parameters are invalid.
|
|
||||||
*/
|
*/
|
||||||
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
|
* sk_eat_skb - Release a skb if it is no longer needed
|
||||||
|
|
|
@ -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);
|
err = memcpy_fromiovec(skb_put(skb, size), msg->msg_iov, size);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
goto free_skb;
|
goto free_skb;
|
||||||
err = sock_tx_timestamp(sk, &skb_shinfo(skb)->tx_flags);
|
|
||||||
if (err < 0)
|
sock_tx_timestamp(sk, &skb_shinfo(skb)->tx_flags);
|
||||||
goto free_skb;
|
|
||||||
|
|
||||||
skb->dev = dev;
|
skb->dev = dev;
|
||||||
skb->sk = sk;
|
skb->sk = sk;
|
||||||
|
|
|
@ -514,9 +514,8 @@ static int ping_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
|
||||||
ipc.opt = NULL;
|
ipc.opt = NULL;
|
||||||
ipc.oif = sk->sk_bound_dev_if;
|
ipc.oif = sk->sk_bound_dev_if;
|
||||||
ipc.tx_flags = 0;
|
ipc.tx_flags = 0;
|
||||||
err = sock_tx_timestamp(sk, &ipc.tx_flags);
|
|
||||||
if (err)
|
sock_tx_timestamp(sk, &ipc.tx_flags);
|
||||||
return err;
|
|
||||||
|
|
||||||
if (msg->msg_controllen) {
|
if (msg->msg_controllen) {
|
||||||
err = ip_cmsg_send(sock_net(sk), msg, &ipc);
|
err = ip_cmsg_send(sock_net(sk), msg, &ipc);
|
||||||
|
|
|
@ -902,9 +902,9 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
|
||||||
ipc.addr = inet->inet_saddr;
|
ipc.addr = inet->inet_saddr;
|
||||||
|
|
||||||
ipc.oif = sk->sk_bound_dev_if;
|
ipc.oif = sk->sk_bound_dev_if;
|
||||||
err = sock_tx_timestamp(sk, &ipc.tx_flags);
|
|
||||||
if (err)
|
sock_tx_timestamp(sk, &ipc.tx_flags);
|
||||||
return err;
|
|
||||||
if (msg->msg_controllen) {
|
if (msg->msg_controllen) {
|
||||||
err = ip_cmsg_send(sock_net(sk), msg, &ipc);
|
err = ip_cmsg_send(sock_net(sk), msg, &ipc);
|
||||||
if (err)
|
if (err)
|
||||||
|
|
|
@ -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 */
|
/* For UDP, check if TX timestamp is enabled */
|
||||||
if (sk->sk_type == SOCK_DGRAM) {
|
if (sk->sk_type == SOCK_DGRAM)
|
||||||
err = sock_tx_timestamp(sk, &tx_flags);
|
sock_tx_timestamp(sk, &tx_flags);
|
||||||
if (err)
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Let's try using as much space as possible.
|
* Let's try using as much space as possible.
|
||||||
|
|
|
@ -1505,9 +1505,8 @@ retry:
|
||||||
skb->dev = dev;
|
skb->dev = dev;
|
||||||
skb->priority = sk->sk_priority;
|
skb->priority = sk->sk_priority;
|
||||||
skb->mark = sk->sk_mark;
|
skb->mark = sk->sk_mark;
|
||||||
err = sock_tx_timestamp(sk, &skb_shinfo(skb)->tx_flags);
|
|
||||||
if (err < 0)
|
sock_tx_timestamp(sk, &skb_shinfo(skb)->tx_flags);
|
||||||
goto out_unlock;
|
|
||||||
|
|
||||||
if (unlikely(extra_len == 4))
|
if (unlikely(extra_len == 4))
|
||||||
skb->no_fcs = 1;
|
skb->no_fcs = 1;
|
||||||
|
@ -2312,9 +2311,8 @@ static int packet_snd(struct socket *sock,
|
||||||
err = skb_copy_datagram_from_iovec(skb, offset, msg->msg_iov, 0, len);
|
err = skb_copy_datagram_from_iovec(skb, offset, msg->msg_iov, 0, len);
|
||||||
if (err)
|
if (err)
|
||||||
goto out_free;
|
goto out_free;
|
||||||
err = sock_tx_timestamp(sk, &skb_shinfo(skb)->tx_flags);
|
|
||||||
if (err < 0)
|
sock_tx_timestamp(sk, &skb_shinfo(skb)->tx_flags);
|
||||||
goto out_free;
|
|
||||||
|
|
||||||
if (!gso_type && (len > dev->mtu + reserve + extra_len)) {
|
if (!gso_type && (len > dev->mtu + reserve + extra_len)) {
|
||||||
/* Earlier code assumed this would be a VLAN pkt,
|
/* Earlier code assumed this would be a VLAN pkt,
|
||||||
|
|
|
@ -600,7 +600,7 @@ void sock_release(struct socket *sock)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(sock_release);
|
EXPORT_SYMBOL(sock_release);
|
||||||
|
|
||||||
int sock_tx_timestamp(struct sock *sk, __u8 *tx_flags)
|
void sock_tx_timestamp(struct sock *sk, __u8 *tx_flags)
|
||||||
{
|
{
|
||||||
*tx_flags = 0;
|
*tx_flags = 0;
|
||||||
if (sock_flag(sk, SOCK_TIMESTAMPING_TX_HARDWARE))
|
if (sock_flag(sk, SOCK_TIMESTAMPING_TX_HARDWARE))
|
||||||
|
@ -609,7 +609,6 @@ int sock_tx_timestamp(struct sock *sk, __u8 *tx_flags)
|
||||||
*tx_flags |= SKBTX_SW_TSTAMP;
|
*tx_flags |= SKBTX_SW_TSTAMP;
|
||||||
if (sock_flag(sk, SOCK_WIFI_STATUS))
|
if (sock_flag(sk, SOCK_WIFI_STATUS))
|
||||||
*tx_flags |= SKBTX_WIFI_STATUS;
|
*tx_flags |= SKBTX_WIFI_STATUS;
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(sock_tx_timestamp);
|
EXPORT_SYMBOL(sock_tx_timestamp);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue