diff --git a/drivers/ethernet/eth_sam_gmac.c b/drivers/ethernet/eth_sam_gmac.c index cd22d28885f..6b02d223788 100644 --- a/drivers/ethernet/eth_sam_gmac.c +++ b/drivers/ethernet/eth_sam_gmac.c @@ -1120,7 +1120,7 @@ static struct net_pkt *frame_get(struct gmac_queue *queue) return NULL; } - rx_frame = net_pkt_get_reserve_rx(K_NO_WAIT); + rx_frame = net_pkt_rx_alloc(K_NO_WAIT); /* Process a frame */ tail = rx_desc_list->tail; diff --git a/drivers/ieee802154/ieee802154_uart_pipe.c b/drivers/ieee802154/ieee802154_uart_pipe.c index 3e40a0314c5..4a48aca0969 100644 --- a/drivers/ieee802154/ieee802154_uart_pipe.c +++ b/drivers/ieee802154/ieee802154_uart_pipe.c @@ -127,7 +127,7 @@ static u8_t *upipe_rx(u8_t *buf, size_t *off) if (upipe->rx_len == upipe->rx_off) { struct net_buf *frag; - pkt = net_pkt_get_reserve_rx(K_NO_WAIT); + pkt = net_pkt_rx_alloc(K_NO_WAIT); if (!pkt) { LOG_DBG("No pkt available"); goto flush; diff --git a/subsys/net/lib/openthread/platform/radio.c b/subsys/net/lib/openthread/platform/radio.c index 43c472385ca..e602d8ab600 100644 --- a/subsys/net/lib/openthread/platform/radio.c +++ b/subsys/net/lib/openthread/platform/radio.c @@ -52,13 +52,13 @@ static u16_t channel; static void dataInit(void) { - tx_pkt = net_pkt_get_reserve_tx(K_NO_WAIT); + tx_pkt = net_pkt_alloc(K_NO_WAIT); __ASSERT_NO_MSG(tx_pkt != NULL); tx_payload = net_pkt_get_reserve_tx_data(K_NO_WAIT); __ASSERT_NO_MSG(tx_payload != NULL); - net_pkt_frag_insert(tx_pkt, tx_payload); + net_pkt_append_buffer(tx_pkt, tx_payload); sTransmitFrame.mPsdu = tx_payload->data; } diff --git a/tests/net/6lo/src/main.c b/tests/net/6lo/src/main.c index 122ad847972..6131824a872 100644 --- a/tests/net/6lo/src/main.c +++ b/tests/net/6lo/src/main.c @@ -308,12 +308,11 @@ static struct net_pkt *create_pkt(struct net_6lo_data *data) u16_t len; int remaining; - pkt = net_pkt_get_reserve_tx(K_FOREVER); + pkt = net_pkt_alloc_on_iface(net_if_get_default(), K_FOREVER); if (!pkt) { return NULL; } - net_pkt_set_iface(pkt, net_if_get_default()); net_pkt_set_ip_hdr_len(pkt, NET_IPV6H_LEN); net_pkt_lladdr_src(pkt)->addr = src_mac; diff --git a/tests/net/ieee802154/fragment/src/main.c b/tests/net/ieee802154/fragment/src/main.c index a0093997d07..91ad83d0ed3 100644 --- a/tests/net/ieee802154/fragment/src/main.c +++ b/tests/net/ieee802154/fragment/src/main.c @@ -236,12 +236,11 @@ static struct net_pkt *create_pkt(struct net_fragment_data *data) u16_t len; int remaining; - pkt = net_pkt_get_reserve_tx(K_FOREVER); + pkt = net_pkt_alloc_on_iface(net_if_get_default(), K_FOREVER); if (!pkt) { return NULL; } - net_pkt_set_iface(pkt, net_if_get_default()); net_pkt_set_ip_hdr_len(pkt, NET_IPV6H_LEN); buf = net_pkt_get_frag(pkt, K_FOREVER); @@ -470,7 +469,7 @@ static bool test_fragment(struct net_fragment_data *data) goto reassemble; } - f_pkt = net_pkt_get_reserve_tx(K_FOREVER); + f_pkt = net_pkt_alloc(K_FOREVER); if (!f_pkt) { goto end; } @@ -509,7 +508,7 @@ reassemble: buf = f_pkt->buffer; while (buf) { - rxpkt = net_pkt_get_reserve_rx(K_FOREVER); + rxpkt = net_pkt_rx_alloc(K_FOREVER); if (!rxpkt) { goto end; } diff --git a/tests/net/ieee802154/l2/src/ieee802154_test.c b/tests/net/ieee802154/l2/src/ieee802154_test.c index bf8af8b0f3b..ecede5c5357 100644 --- a/tests/net/ieee802154/l2/src/ieee802154_test.c +++ b/tests/net/ieee802154/l2/src/ieee802154_test.c @@ -219,7 +219,7 @@ static bool test_ack_reply(struct ieee802154_pkt_test *t) NET_INFO("- Sending ACK reply to a data packet\n"); - pkt = net_pkt_get_reserve_rx(K_FOREVER); + pkt = net_pkt_rx_alloc(K_FOREVER); frag = net_pkt_get_frag(pkt, K_FOREVER); memcpy(frag->data, data_pkt, sizeof(data_pkt)); @@ -267,7 +267,7 @@ static bool initialize_test_environment(void) k_sem_reset(&driver_lock); - current_pkt = net_pkt_get_reserve_rx(K_FOREVER); + current_pkt = net_pkt_rx_alloc(K_FOREVER); if (!current_pkt) { NET_ERR("*** No buffer to allocate\n"); return false;