cmhi
/
f-stack
mirror of https://github.com/F-Stack/f-stack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some build errors of dpdk-19.11.14 with gcc-13.2.0.

This commit is contained in:
fengbojiang 2024-10-14 11:34:51 +08:00
parent dc686e4a85
commit 08fb383d70
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dpdk/drivers/net/ena/ena_ethdev.c
View File

@ -601,8 +601,7 @@ static int ena_rss_reta_query(struct rte_eth_dev *dev,
int reta_conf_idx;
int reta_idx;
if (reta_size == 0 || reta_conf == NULL ||
(reta_size > RTE_RETA_GROUP_SIZE && ((reta_conf + 1) == NULL)))
if (reta_size == 0 || reta_conf == NULL)
return -EINVAL;
rc = ena_com_indirect_table_get(ena_dev, indirect_table);

10
dpdk/kernel/linux/kni/kni_dev.h
View File

@ -102,11 +102,13 @@ static inline phys_addr_t iova_to_phys(struct task_struct *tsk,
/* Read one page struct info */
#ifdef HAVE_TSK_IN_GUP
ret = get_user_pages_remote(tsk, tsk->mm, iova, 1,
FOLL_TOUCH, &page, NULL, NULL);
ret = get_user_pages_remote(tsk, tsk->mm, iova, 1, 0, &page, NULL, NULL);
#else
ret = get_user_pages_remote(tsk->mm, iova, 1,
FOLL_TOUCH, &page, NULL, NULL);
#ifdef HAVE_VMA_IN_GUP
ret = get_user_pages_remote(tsk->mm, iova, 1, 0, &page, NULL, NULL);
#else
ret = get_user_pages_remote(tsk->mm, iova, 1, 0, &page, NULL);
#endif
#endif
if (ret < 0)
return 0;

4
dpdk/kernel/linux/kni/kni_net.c
View File

@ -806,8 +806,8 @@ static const struct net_device_ops kni_net_netdev_ops = {
static void kni_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info)
{
strlcpy(info->version, KNI_VERSION, sizeof(info->version));
strlcpy(info->driver, "kni", sizeof(info->driver));
strscpy(info->version, KNI_VERSION, sizeof(info->version));
strscpy(info->driver, "kni", sizeof(info->driver));
}
static const struct ethtool_ops kni_net_ethtool_ops = {