[v4,2/2] ip_frag: updated name for IP frag define
Checks
Commit Message
Removed LIBRTE from name as its an old prefix.
Signed-off-by: Euan Bourke <euan.bourke@intel.com>
---
app/test/test_reassembly_perf.c | 2 +-
config/rte_config.h | 2 +-
doc/guides/prog_guide/ip_fragment_reassembly_lib.rst | 8 ++++----
doc/guides/sample_app_ug/ip_reassembly.rst | 4 ++--
examples/ip_fragmentation/main.c | 2 +-
examples/ip_reassembly/main.c | 2 +-
examples/ipsec-secgw/ipsec_worker.h | 2 +-
lib/ip_frag/ip_reassembly.h | 2 +-
lib/ip_frag/rte_ip_frag.h | 2 +-
9 files changed, 13 insertions(+), 13 deletions(-)
@@ -20,7 +20,7 @@
#define MAX_FLOWS (1024 * 32)
#define MAX_BKTS MAX_FLOWS
#define MAX_ENTRIES_PER_BKT 16
-#define MAX_FRAGMENTS RTE_LIBRTE_IP_FRAG_MAX_FRAG
+#define MAX_FRAGMENTS RTE_IP_FRAG_MAX_FRAG
#define MIN_FRAGMENTS 2
#define MAX_PKTS (MAX_FLOWS * MAX_FRAGMENTS)
@@ -85,7 +85,7 @@
#define RTE_RAWDEV_MAX_DEVS 64
/* ip_fragmentation defines */
-#define RTE_LIBRTE_IP_FRAG_MAX_FRAG 8
+#define RTE_IP_FRAG_MAX_FRAG 8
// RTE_LIBRTE_IP_FRAG_TBL_STAT is not set
/* rte_power defines */
@@ -43,12 +43,12 @@ Note that all update/lookup operations on Fragment Table are not thread safe.
So if different execution contexts (threads/processes) will access the same table simultaneously,
then some external syncing mechanism have to be provided.
-Each table entry can hold information about packets of up to ``RTE_LIBRTE_IP_FRAG_MAX_FRAG`` fragments,
-where ``RTE_LIBRTE_IP_FRAG_MAX_FRAG`` defaults to:
+Each table entry can hold information about packets of up to ``RTE_IP_FRAG_MAX_FRAG`` fragments,
+where ``RTE_IP_FRAG_MAX_FRAG`` defaults to:
.. literalinclude:: ../../../config/rte_config.h
:language: c
- :start-at: #define RTE_LIBRTE_IP_FRAG_MAX_FRAG
+ :start-at: #define RTE_IP_FRAG_MAX_FRAG
:lines: 1
Code example, that demonstrates creation of a new Fragment table:
@@ -69,7 +69,7 @@ Also, entries that resides in the table longer then <max_cycles> are considered
and could be removed/replaced by the new ones.
Note that reassembly demands a lot of mbuf's to be allocated.
-At any given time up to (2 \* bucket_entries \* RTE_LIBRTE_IP_FRAG_MAX \* <maximum number of mbufs per packet>)
+At any given time up to (2 \* bucket_entries \* RTE_IP_FRAG_MAX_FRAG \* <maximum number of mbufs per packet>)
can be stored inside Fragment Table waiting for remaining fragments.
Packet Reassembly
@@ -135,7 +135,7 @@ Fragment table maintains information about already received fragments of the pac
Each IP packet is uniquely identified by triple <Source IP address>, <Destination IP address>, <ID>.
To avoid lock contention, each RX queue has its own Fragment Table,
e.g. the application can't handle the situation when different fragments of the same packet arrive through different RX queues.
-Each table entry can hold information about packet consisting of up to RTE_LIBRTE_IP_FRAG_MAX_FRAGS fragments.
+Each table entry can hold information about packet consisting of up to RTE_IP_FRAG_MAX_FRAG fragments.
.. literalinclude:: ../../../examples/ip_reassembly/main.c
:language: c
@@ -147,7 +147,7 @@ Mempools Initialization
~~~~~~~~~~~~~~~~~~~~~~~
The reassembly application demands a lot of mbuf's to be allocated.
-At any given time up to (2 \* max_flow_num \* RTE_LIBRTE_IP_FRAG_MAX_FRAGS \* <maximum number of mbufs per packet>)
+At any given time up to (2 \* max_flow_num \* RTE_IP_FRAG_MAX_FRAG \* <maximum number of mbufs per packet>)
can be stored inside Fragment Table waiting for remaining fragments.
To keep mempool size under reasonable limits and to avoid situation when one RX queue can starve other queues,
each RX queue uses its own mempool.
@@ -71,7 +71,7 @@
/*
* Max number of fragments per packet expected - defined by config file.
*/
-#define MAX_PACKET_FRAG RTE_LIBRTE_IP_FRAG_MAX_FRAG
+#define MAX_PACKET_FRAG RTE_IP_FRAG_MAX_FRAG
#define NB_MBUF 8192
@@ -69,7 +69,7 @@
#define MIN_FLOW_TTL 1
#define DEF_FLOW_TTL MS_PER_S
-#define MAX_FRAG_NUM RTE_LIBRTE_IP_FRAG_MAX_FRAG
+#define MAX_FRAG_NUM RTE_IP_FRAG_MAX_FRAG
/* Should be power of two. */
#define IP_FRAG_TBL_BUCKET_ENTRIES 16
@@ -291,7 +291,7 @@ send_fragment_packet(struct lcore_conf *qconf, struct rte_mbuf *m,
len = tbl->len;
/* free space for new fragments */
- if (len + RTE_LIBRTE_IP_FRAG_MAX_FRAG >= RTE_DIM(tbl->m_table)) {
+ if (len + RTE_IP_FRAG_MAX_FRAG >= RTE_DIM(tbl->m_table)) {
send_burst(qconf, len, port);
len = 0;
}
@@ -16,7 +16,7 @@ enum {
IP_LAST_FRAG_IDX, /* index of last fragment */
IP_FIRST_FRAG_IDX, /* index of first fragment */
IP_MIN_FRAG_NUM, /* minimum number of fragments */
- IP_MAX_FRAG_NUM = RTE_LIBRTE_IP_FRAG_MAX_FRAG,
+ IP_MAX_FRAG_NUM = RTE_IP_FRAG_MAX_FRAG,
/* maximum number of fragments per packet */
};
@@ -32,7 +32,7 @@ struct rte_mbuf;
/** death row size in mbufs */
#define RTE_IP_FRAG_DEATH_ROW_MBUF_LEN \
- (RTE_IP_FRAG_DEATH_ROW_LEN * (RTE_LIBRTE_IP_FRAG_MAX_FRAG + 1))
+ (RTE_IP_FRAG_DEATH_ROW_LEN * (RTE_IP_FRAG_MAX_FRAG + 1))
/** mbuf death row (packets to be freed) */
struct rte_ip_frag_death_row {