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

WindyLQL · May 17, 2017 · cd915f5 · cd915f5
2 parents c15aae7 + 97d5989
commit cd915f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/ff_dpdk_if.c b/lib/ff_dpdk_if.c
@@ -478,13 +478,13 @@ init_arp_ring(void)
                     ARP_RING_SIZE, socketid,
                     RING_F_SC_DEQ);
                 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 {
                 arp_ring[i][port_id] = rte_ring_lookup(name_buf);
             }
 
             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",
                 name_buf, rte_ring_free_count(arp_ring[i][port_id]));

diff --git a/lib/ff_kern_timeout.c b/lib/ff_kern_timeout.c
@@ -1662,7 +1662,7 @@ ff_tc_get_timecount(struct timecounter *tc)
 }
 
 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