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

Merge branch 'master' of https://github.com/F-Stack/f-stack

This commit is contained in:
fengbojiang 2022-08-27 20:48:45 +08:00
parent 782d5777bd 8edd7a76c2
commit 2156ba56d9
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ff_dpdk_if.c
View File

@ -53,6 +53,7 @@
#include <rte_tcp.h>
#include <rte_udp.h>
#include <rte_eth_bond.h>
#include <rte_eth_bond_8023ad.h>
#include "ff_dpdk_if.h"
#include "ff_dpdk_pcap.h"
@ -576,6 +577,9 @@ init_port_start(void)
struct ff_port_cfg *pconf = &ff_global_cfg.dpdk.port_cfgs[u_port_id];
uint16_t nb_queues = pconf->nb_lcores;
if (pconf->nb_slaves > 0) {
rte_eth_bond_8023ad_dedicated_queues_enable(u_port_id);
}
for (j=0; j<=pconf->nb_slaves; j++) {
if (j < pconf->nb_slaves) {
port_id = pconf->slave_portid_list[j];

5
tools/compat/ioctl.c
View File

@ -114,7 +114,7 @@ ioctl_va(int fd, unsigned long com, void *data, int argc, ...)
msg->ioctl.cmd = com;
msg->ioctl.data = msg->buf_addr;
memcpy(msg->ioctl.data, data, size);
msg->buf_addr += size;
char *buf_addr = msg->buf_addr + size;
if (argc == 3) {
if (size + clen > msg->buf_len) {
@ -123,7 +123,6 @@ ioctl_va(int fd, unsigned long com, void *data, int argc, ...)
return -1;
}
char *ptr = (char *)(msg->ioctl.data) + offset;
char *buf_addr = msg->buf_addr;
memcpy(ptr, &buf_addr, sizeof(char *));
memcpy(buf_addr, cpy_mem, clen);
}
@ -152,7 +151,7 @@ ioctl_va(int fd, unsigned long com, void *data, int argc, ...)
if (com & IOC_OUT) {
memcpy(data, retmsg->ioctl.data, size);
if (argc == 3) {
memcpy(cpy_mem, retmsg->buf_addr, clen);
memcpy(cpy_mem, buf_addr, clen);
char *ptr = (char *)data + offset;
memcpy(ptr, &cpy_mem, sizeof(void *));
}