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

Commit 678ca42d authored by Willem de Bruijn's avatar Willem de Bruijn Committed by David S. Miller
Browse files

ip: remove tx_flags from ipcm_cookie and use same logic for v4 and v6 



skb_shinfo(skb)->tx_flags is derived from sk->sk_tsflags, possibly
after modification by __sock_cmsg_send, by calling sock_tx_timestamp.

The IPv4 and IPv6 paths do this conversion differently. In IPv4, the
individual protocols that support tx timestamps call this function
and store the result in ipc.tx_flags. In IPv6, sock_tx_timestamp is
called in __ip6_append_data.

There is no need to store both tx_flags and ts_flags in the cookie
as one is derived from the other. Convert when setting up the cork
and remove the redundant field. This is similar to IPv6, only have
the conversion happen only once per datagram, in ip(6)_setup_cork.

Also change __ip6_append_data to match __ip_append_data. Only update
tskey if timestamping is enabled with OPT_ID. The SOCK_.. test is
redundant: only valid protocols can have non-zero cork->tx_flags.

After this change the IPv4 and IPv6 logic is the same.

Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5fdaa88d

include/net/ip.h

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ struct ipcm_cookie { 
	__be32			addr;

	int			oif;

	struct ip_options_rcu	*opt;

	__u8			tx_flags;

	__u8			ttl;

	__s16			tos;

	char			priority;

net/ipv4/ip_output.c

+2 −1
Original line number Diff line number Diff line
@@ -1153,8 +1153,9 @@ static int ip_setup_cork(struct sock *sk, struct inet_cork *cork, 
	cork->ttl = ipc->ttl;

	cork->tos = ipc->tos;

	cork->priority = ipc->priority;

	cork->tx_flags = ipc->tx_flags;

	cork->transmit_time = ipc->sockc.transmit_time;

	cork->tx_flags = 0;

	sock_tx_timestamp(sk, ipc->sockc.tsflags, &cork->tx_flags);



	return 0;

}

net/ipv4/ping.c

+0 −2
Original line number Diff line number Diff line
@@ -763,8 +763,6 @@ static int ping_v4_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
		rcu_read_unlock();

	}



	sock_tx_timestamp(sk, ipc.sockc.tsflags, &ipc.tx_flags);



	saddr = ipc.addr;

	ipc.addr = faddr = daddr;

net/ipv4/raw.c

+0 −2
Original line number Diff line number Diff line
@@ -665,8 +665,6 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
				      &rt, msg->msg_flags, &ipc.sockc);



	 else {

		sock_tx_timestamp(sk, ipc.sockc.tsflags, &ipc.tx_flags);



		if (!ipc.addr)

			ipc.addr = fl4.daddr;

		lock_sock(sk);

net/ipv4/udp.c

+0 −2
Original line number Diff line number Diff line
@@ -1020,8 +1020,6 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
	saddr = ipc.addr;

	ipc.addr = faddr = daddr;



	sock_tx_timestamp(sk, ipc.sockc.tsflags, &ipc.tx_flags);



	if (ipc.opt && ipc.opt->opt.srr) {

		if (!daddr) {

			err = -EINVAL;