luchianmihai/walnux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net/can: fix timestamp

Browse source 
Fix timestamp in socket CAN. Right now the timestamp is only generated
if there is no reader and the frame is stored in the read ahead list.
This is solved by moving the timestamp generation before the code flow
branch.

Signed-off-by: Javier Casas <javiercasas@geotab.com>
This commit is contained in:
Javier Casas 2025-03-07 09:40:59 +01:00 • committed by Alan C. Assis
parent e15f7b13c7
commit 73f9ef00e2
1 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
net/can/can_callback.c
View file

@ -119,20 +119,6 @@ uint16_t can_callback(FAR struct net_driver_s *dev,
if (conn)
{
/* Try to lock the network when successful send data to the listener */
if (net_trylock() == OK)
{
flags = devif_conn_event(dev, flags, conn->sconn.list);
net_unlock();
}
/* Either we did not get the lock or there is no application listening
* If we did not get a lock we store the frame in the read-ahead buffer
*/
if ((flags & CAN_NEWDATA) != 0)
{
#ifdef CONFIG_NET_TIMESTAMP
/* TIMESTAMP sockopt is activated,
* create timestamp and copy to iob
@ -150,18 +136,27 @@ uint16_t can_callback(FAR struct net_driver_s *dev,
len = iob_trycopyin(dev->d_iob, (FAR uint8_t *)&tv,
sizeof(struct timeval),
-CONFIG_NET_LL_GUARDSIZE, false);
if (len != sizeof(struct timeval))
{
dev->d_len = 0;
return flags & ~CAN_NEWDATA;
}
else
if (len == sizeof(struct timeval))
{
dev->d_len += len;
}
}
#endif
/* Try to lock the network when successful send data to the listener */
if (net_trylock() == OK)
{
flags = devif_conn_event(dev, flags, conn->sconn.list);
net_unlock();
}
/* Either we did not get the lock or there is no application listening
* If we did not get a lock we store the frame in the read-ahead buffer
*/
if ((flags & CAN_NEWDATA) != 0)
{
/* Data was not handled.. dispose of it appropriately */
flags = can_data_event(dev, conn, flags);