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

Commit 96a6d1bb authored by Marc Kleine-Budde's avatar Marc Kleine-Budde Committed by Greg Kroah-Hartman
Browse files

can: raw: add support for SO_TXTIME/SCM_TXTIME 

[ Upstream commit 51a0d5e51178fcd147c1b8fdab2ed16b561326db ]

This patch calls into sock_cmsg_send() to parse the user supplied
control information into a struct sockcm_cookie. Then assign the
requested transmit time to the skb.

This makes it possible to use the Earliest TXTIME First (ETF) packet
scheduler with the CAN_RAW protocol. The user can send a CAN_RAW frame
with a TXTIME and the kernel (with the ETF scheduler) will take care
of sending it to the network interface.

Link: https://lore.kernel.org/all/20220502091946.1916211-3-mkl@pengutronix.de


Acked-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Stable-dep-of: 7f6ca95d16b9 ("net: Implement missing getsockopt(SO_TIMESTAMPING_NEW)")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b1719cbb

net/can/raw.c

+10 −1
Original line number Diff line number Diff line
@@ -770,6 +770,7 @@ static int raw_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) 
{

	struct sock *sk = sock->sk;

	struct raw_sock *ro = raw_sk(sk);

	struct sockcm_cookie sockc;

	struct sk_buff *skb;

	struct net_device *dev;

	int ifindex;
@@ -815,11 +816,19 @@ static int raw_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) 
	if (err < 0)

		goto free_skb;



	skb_setup_tx_timestamp(skb, sk->sk_tsflags);

	sockcm_init(&sockc, sk);

	if (msg->msg_controllen) {

		err = sock_cmsg_send(sk, msg, &sockc);

		if (unlikely(err))

			goto free_skb;

	}



	skb->dev = dev;

	skb->sk  = sk;

	skb->priority = sk->sk_priority;

	skb->tstamp = sockc.transmit_time;



	skb_setup_tx_timestamp(skb, sockc.tsflags);



	err = can_send(skb, ro->loopback);