Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-09-22 14:41:29 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

mm/iob: Support negative offset when copyin/out.

Browse Source 
Signed-off-by: Zhe Weng <wengzhe@xiaomi.com>
This commit is contained in:
Zhe Weng
2023-01-31 00:39:15 +08:00
committed by Xiang Xiao
parent 0f35ad29a8
commit be89bcc044
5 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/netdev/netdev_input.c
+5 -18
View File
@@ -68,8 +68,6 @@ int netdev_input(FAR struct net_driver_s *dev,
{
uint16_t llhdrlen = NET_LL_HDRLEN(dev);
FAR uint8_t *buf = dev->d_buf;
unsigned int offset;
unsigned int l3l4len;
int ret;
/* Prepare iob buffer */
@@ -80,32 +78,21 @@ int netdev_input(FAR struct net_driver_s *dev,
return ret;
}
/* Copy l2 header to gruard area */
/* Copy data to iob entry */
offset = dev->d_iob->io_offset - llhdrlen;
memcpy(dev->d_iob->io_data + offset, buf, llhdrlen);
/* Copy l3/l4 data to iob entry */
l3l4len = dev->d_len - llhdrlen;
ret = iob_trycopyin(dev->d_iob, buf + llhdrlen,
l3l4len, 0, false);
if (ret == l3l4len)
ret = iob_trycopyin(dev->d_iob, buf, dev->d_len, -llhdrlen, false);
if (ret == dev->d_len)
{
/* Update device buffer to l2 start */
dev->d_buf = dev->d_iob->io_data + offset;
iob_update_pktlen(dev->d_iob, l3l4len);
dev->d_buf = NETLLBUF;
ret = callback(dev);
if (dev->d_iob != NULL && reply)
{
if (ret == OK && dev->d_len > 0)
{
iob_copyout(buf + llhdrlen, dev->d_iob, dev->d_len, 0);
memcpy(buf, dev->d_iob->io_data + offset, llhdrlen);
iob_copyout(buf, dev->d_iob, dev->d_len, -llhdrlen);
}
}
}