vitalif
/
f-stack
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

dev
whl739 2017-05-17 15:18:42 +08:00
parent c15aae717a 97d5989cd7
commit cd915f5022
2 changed files with 3 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

@ -478,13 +478,13 @@ init_arp_ring(void)
ARP_RING_SIZE, socketid, ARP_RING_SIZE, socketid,
RING_F_SC_DEQ); RING_F_SC_DEQ);
if (rte_ring_lookup(name_buf) != arp_ring[i][port_id]) if (rte_ring_lookup(name_buf) != arp_ring[i][port_id])
rte_panic("lookup kni ring:%s failed!\n", name_buf); rte_panic("lookup arp ring:%s failed!\n", name_buf);
} else { } else {
arp_ring[i][port_id] = rte_ring_lookup(name_buf); arp_ring[i][port_id] = rte_ring_lookup(name_buf);
} }
if (arp_ring[i][port_id] == NULL) if (arp_ring[i][port_id] == NULL)
rte_panic("create kni ring::%s failed!\n", name_buf); rte_panic("create arp ring::%s failed!\n", name_buf);
printf("create arp ring:%s success, %u ring entries are now free!\n", printf("create arp ring:%s success, %u ring entries are now free!\n",
name_buf, rte_ring_free_count(arp_ring[i][port_id])); name_buf, rte_ring_free_count(arp_ring[i][port_id]));

2
lib/ff_kern_timeout.c
View File

@ -1662,7 +1662,7 @@ ff_tc_get_timecount(struct timecounter *tc)
} }
static struct timecounter ff_timecounter = { static struct timecounter ff_timecounter = {
ff_tc_get_timecount, 0, ~0u, 100, "fst clock", 1 ff_tc_get_timecount, 0, ~0u, 100, "ff_clock", 1
}; };
static void static void