aboutsummaryrefslogtreecommitdiffstats
path: root/src/vnet
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2019-01-18 20:45:30 +0100
committerFlorin Coras <florin.coras@gmail.com>2019-01-19 00:17:51 +0000
commit36eb7c214280a5442186a2d13ed018bbd26a1a3a (patch)
tree6cdb6809f6d4eb19c87d314eb6f7f74764270794 /src/vnet
parentab9b7ec210059573c2cbe3ed961de533ba43e435 (diff)
buffers: remove free-list information from buffer metadata
Change-Id: I6048c6a51efa826ac333f7d15919cb87dd766d74 Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vnet')
-rw-r--r--src/vnet/dhcp/dhcp6_proxy_node.c5
-rw-r--r--src/vnet/dns/dns.c1
-rwxr-xr-xsrc/vnet/ip/ping.c3
-rw-r--r--src/vnet/sctp/sctp_output.c1
-rw-r--r--src/vnet/tcp/tcp_output.c1
5 files changed, 3 insertions, 8 deletions
diff --git a/src/vnet/dhcp/dhcp6_proxy_node.c b/src/vnet/dhcp/dhcp6_proxy_node.c
index 432bc8dbe68..ea06c18cb10 100644
--- a/src/vnet/dhcp/dhcp6_proxy_node.c
+++ b/src/vnet/dhcp/dhcp6_proxy_node.c
@@ -315,9 +315,8 @@ dhcpv6_proxy_to_server_input (vlib_main_t * vm,
copy_ip6_address (&r1->link_addr, ia0);
link_address_set:
- fl =
- vlib_buffer_get_free_list (vm,
- vlib_buffer_get_free_list_index (b0));
+ fl = vlib_buffer_get_free_list
+ (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
if ((b0->current_length + sizeof (*id1) + sizeof (*vss1) +
sizeof (*cmac)) > fl->n_data_bytes)
diff --git a/src/vnet/dns/dns.c b/src/vnet/dns/dns.c
index 93b7fb8b9f4..15d40beb710 100644
--- a/src/vnet/dns/dns.c
+++ b/src/vnet/dns/dns.c
@@ -2810,7 +2810,6 @@ vnet_send_dns4_reply (dns_main_t * dm, dns_pending_request_t * pr,
* In the resolution-required / deferred case, resetting a freshly-allocated
* buffer won't hurt. We hope.
*/
- b0->flags &= VLIB_BUFFER_NON_DEFAULT_FREELIST;
b0->flags |= (VNET_BUFFER_F_LOCALLY_ORIGINATED
| VLIB_BUFFER_TOTAL_LENGTH_VALID);
b0->current_data = 0;
diff --git a/src/vnet/ip/ping.c b/src/vnet/ip/ping.c
index f147e47f1c2..92a92e50201 100755
--- a/src/vnet/ip/ping.c
+++ b/src/vnet/ip/ping.c
@@ -404,8 +404,7 @@ init_icmp46_echo_request (vlib_main_t * vm, vlib_buffer_t * b0,
int this_buf_data_len =
remaining_data_len <
VLIB_BUFFER_DATA_SIZE ? remaining_data_len : VLIB_BUFFER_DATA_SIZE;
- int n_alloc = vlib_buffer_alloc_from_free_list (vm, &b0->next_buffer, 1,
- hb->free_list_index);
+ int n_alloc = vlib_buffer_alloc (vm, &b0->next_buffer, 1);
if (n_alloc < 1)
{
/* That is how much we have so far - return it... */
diff --git a/src/vnet/sctp/sctp_output.c b/src/vnet/sctp/sctp_output.c
index c0e1a6eb339..17b28a86492 100644
--- a/src/vnet/sctp/sctp_output.c
+++ b/src/vnet/sctp/sctp_output.c
@@ -271,7 +271,6 @@ always_inline void *
sctp_init_buffer (vlib_main_t * vm, vlib_buffer_t * b)
{
ASSERT ((b->flags & VLIB_BUFFER_NEXT_PRESENT) == 0);
- b->flags &= VLIB_BUFFER_NON_DEFAULT_FREELIST;
b->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
b->total_length_not_including_first_buffer = 0;
vnet_buffer (b)->sctp.flags = 0;
diff --git a/src/vnet/tcp/tcp_output.c b/src/vnet/tcp/tcp_output.c
index 97f5b81f9e8..8d06ea35295 100644
--- a/src/vnet/tcp/tcp_output.c
+++ b/src/vnet/tcp/tcp_output.c
@@ -519,7 +519,6 @@ static void *
tcp_init_buffer (vlib_main_t * vm, vlib_buffer_t * b)
{
ASSERT ((b->flags & VLIB_BUFFER_NEXT_PRESENT) == 0);
- b->flags &= VLIB_BUFFER_NON_DEFAULT_FREELIST;
b->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
b->total_length_not_including_first_buffer = 0;
b->current_data = 0;