net: buf: remove use of special putter and getter functions

Convert users of net_buf_put() and net_buf_get() functions to use
non-wrapped putters and getters k_fifo_put() and k_fifo_get().

Special handling of net_bufs in k_fifos is no longer needed after commit
3d306c1, since these actions are now
atomic regardless of any net_buf fragments.

Signed-off-by: Henrik Brix Andersen <[email protected]>

Author: henrikbrixandersen

drivers/bluetooth/hci/h4.c

@@ -252,7 +252,7 @@ static void rx_thread(void *p1, void *p2, void *p3)
 		/* Let the ISR continue receiving new packets */
 		uart_irq_rx_enable(cfg->uart);
 
-		buf = net_buf_get(&h4->rx.fifo, K_FOREVER);
+		buf = k_fifo_get(&h4->rx.fifo, K_FOREVER);
 		do {
 			uart_irq_rx_enable(cfg->uart);
 
@@ -266,7 +266,7 @@ static void rx_thread(void *p1, void *p2, void *p3)
 			k_yield();
 
 			uart_irq_rx_disable(cfg->uart);
-			buf = net_buf_get(&h4->rx.fifo, K_NO_WAIT);
+			buf = k_fifo_get(&h4->rx.fifo, K_NO_WAIT);
 		} while (buf);
 	}
 }
@@ -352,7 +352,7 @@ static inline void read_payload(const struct device *dev)
 	reset_rx(h4);
 
 	LOG_DBG("Putting buf %p to rx fifo", buf);
-	net_buf_put(&h4->rx.fifo, buf);
+	k_fifo_put(&h4->rx.fifo, buf);
 }
 
 static inline void read_header(const struct device *dev)
@@ -398,7 +398,7 @@ static inline void process_tx(const struct device *dev)
 	int bytes;
 
 	if (!h4->tx.buf) {
-		h4->tx.buf = net_buf_get(&h4->tx.fifo, K_NO_WAIT);
+		h4->tx.buf = k_fifo_get(&h4->tx.fifo, K_NO_WAIT);
 		if (!h4->tx.buf) {
 			LOG_ERR("TX interrupt but no pending buffer!");
 			uart_irq_tx_disable(cfg->uart);
@@ -447,7 +447,7 @@ static inline void process_tx(const struct device *dev)
 done:
 	h4->tx.type = BT_HCI_H4_NONE;
 	net_buf_unref(h4->tx.buf);
-	h4->tx.buf = net_buf_get(&h4->tx.fifo, K_NO_WAIT);
+	h4->tx.buf = k_fifo_get(&h4->tx.fifo, K_NO_WAIT);
 	if (!h4->tx.buf) {
 		uart_irq_tx_disable(cfg->uart);
 	}
@@ -496,7 +496,7 @@ static int h4_send(const struct device *dev, struct net_buf *buf)
 
 	LOG_DBG("buf %p type %u len %u", buf, bt_buf_get_type(buf), buf->len);
 
-	net_buf_put(&h4->tx.fifo, buf);
+	k_fifo_put(&h4->tx.fifo, buf);
 	uart_irq_tx_enable(cfg->uart);
 
 	return 0;

drivers/bluetooth/hci/h5.c

@@ -212,7 +212,7 @@ static void process_unack(struct h5_data *h5)
 	LOG_DBG("Need to remove %u packet from the queue", number_removed);
 
 	while (number_removed) {
-		struct net_buf *buf = net_buf_get(&h5->unack_queue, K_NO_WAIT);
+		struct net_buf *buf = k_fifo_get(&h5->unack_queue, K_NO_WAIT);
 
 		if (!buf) {
 			LOG_ERR("Unack queue is empty");
@@ -349,22 +349,22 @@ static void retx_timeout(struct k_work *work)
 		k_fifo_init(&tmp_queue);
 
 		/* Queue to temporary queue */
-		while ((buf = net_buf_get(&h5->tx_queue, K_NO_WAIT))) {
-			net_buf_put(&tmp_queue, buf);
+		while ((buf = k_fifo_get(&h5->tx_queue, K_NO_WAIT))) {
+			k_fifo_put(&tmp_queue, buf);
 		}
 
 		/* Queue unack packets to the beginning of the queue */
-		while ((buf = net_buf_get(&h5->unack_queue, K_NO_WAIT))) {
+		while ((buf = k_fifo_get(&h5->unack_queue, K_NO_WAIT))) {
 			/* include also packet type */
 			net_buf_push(buf, sizeof(uint8_t));
-			net_buf_put(&h5->tx_queue, buf);
+			k_fifo_put(&h5->tx_queue, buf);
 			h5->tx_seq = (h5->tx_seq - 1) & 0x07;
 			h5->unack_queue_len--;
 		}
 
 		/* Queue saved packets from temp queue */
-		while ((buf = net_buf_get(&tmp_queue, K_NO_WAIT))) {
-			net_buf_put(&h5->tx_queue, buf);
+		while ((buf = k_fifo_get(&tmp_queue, K_NO_WAIT))) {
+			k_fifo_put(&h5->tx_queue, buf);
 		}
 	}
 }
@@ -408,7 +408,7 @@ static void h5_process_complete_packet(const struct device *dev, uint8_t *hdr)
 		net_buf_unref(buf);
 		break;
 	case HCI_3WIRE_LINK_PKT:
-		net_buf_put(&h5->rx_queue, buf);
+		k_fifo_put(&h5->rx_queue, buf);
 		break;
 	case HCI_EVENT_PKT:
 	case HCI_ACLDATA_PKT:
@@ -619,7 +619,7 @@ static int h5_queue(const struct device *dev, struct net_buf *buf)
 
 	memcpy(net_buf_push(buf, sizeof(type)), &type, sizeof(type));
 
-	net_buf_put(&h5->tx_queue, buf);
+	k_fifo_put(&h5->tx_queue, buf);
 
 	return 0;
 }
@@ -653,15 +653,15 @@ static void tx_thread(void *p1, void *p2, void *p3)
 			k_sleep(K_MSEC(100));
 			break;
 		case ACTIVE:
-			buf = net_buf_get(&h5->tx_queue, K_FOREVER);
+			buf = k_fifo_get(&h5->tx_queue, K_FOREVER);
 			type = h5_get_type(buf);
 
 			h5_send(dev, buf->data, type, buf->len);
 
 			/* buf is dequeued from tx_queue and queued to unack
 			 * queue.
 			 */
-			net_buf_put(&h5->unack_queue, buf);
+			k_fifo_put(&h5->unack_queue, buf);
 			h5->unack_queue_len++;
 
 			k_work_reschedule(&h5->retx_work, H5_TX_ACK_TIMEOUT);
@@ -689,7 +689,7 @@ static void rx_thread(void *p1, void *p2, void *p3)
 	while (true) {
 		struct net_buf *buf;
 
-		buf = net_buf_get(&h5->rx_queue, K_FOREVER);
+		buf = k_fifo_get(&h5->rx_queue, K_FOREVER);
 
 		hexdump("=> ", buf->data, buf->len);
 

drivers/bluetooth/hci/hci_da1469x.c

@@ -242,7 +242,7 @@ static void rx_thread(void *p1, void *p2, void *p3)
 		/* Let the ISR continue receiving new packets */
 		rx_isr_start();
 
-		buf = net_buf_get(&rx.fifo, K_FOREVER);
+		buf = k_fifo_get(&rx.fifo, K_FOREVER);
 		do {
 			rx_isr_start();
 
@@ -257,7 +257,7 @@ static void rx_thread(void *p1, void *p2, void *p3)
 
 			rx_isr_stop();
 
-			buf = net_buf_get(&rx.fifo, K_NO_WAIT);
+			buf = k_fifo_get(&rx.fifo, K_NO_WAIT);
 		} while (buf);
 	}
 }
@@ -339,7 +339,7 @@ static inline void read_payload(void)
 	reset_rx();
 
 	LOG_DBG("Putting buf %p to rx fifo", buf);
-	net_buf_put(&rx.fifo, buf);
+	k_fifo_put(&rx.fifo, buf);
 }
 
 static inline void read_header(void)

drivers/usb/udc/udc_common.c

@@ -124,7 +124,7 @@ struct net_buf *udc_buf_get(const struct device *dev, const uint8_t ep)
 		return NULL;
 	}
 
-	return net_buf_get(&ep_cfg->fifo, K_NO_WAIT);
+	return k_fifo_get(&ep_cfg->fifo, K_NO_WAIT);
 }
 
 struct net_buf *udc_buf_get_all(const struct device *dev, const uint8_t ep)
@@ -169,7 +169,7 @@ struct net_buf *udc_buf_peek(const struct device *dev, const uint8_t ep)
 void udc_buf_put(struct udc_ep_config *const ep_cfg,
 		 struct net_buf *const buf)
 {
-	net_buf_put(&ep_cfg->fifo, buf);
+	k_fifo_put(&ep_cfg->fifo, buf);
 }
 
 void udc_ep_buf_set_setup(struct net_buf *const buf)

drivers/usb/udc/udc_mcux_ehci.c

@@ -151,7 +151,7 @@ static int udc_mcux_ctrl_feed_dout(const struct device *dev,
 		return -ENOMEM;
 	}
 
-	net_buf_put(&cfg->fifo, buf);
+	k_fifo_put(&cfg->fifo, buf);
 
 	ret = udc_mcux_ep_feed(dev, cfg, buf);
 

drivers/usb/udc/udc_mcux_ip3511.c

@@ -151,7 +151,7 @@ static int udc_mcux_ctrl_feed_dout(const struct device *dev,
 		return -ENOMEM;
 	}
 
-	net_buf_put(&cfg->fifo, buf);
+	k_fifo_put(&cfg->fifo, buf);
 
 	ret = udc_mcux_ep_feed(dev, cfg, buf);
 

drivers/usb/udc/udc_nrf.c

@@ -308,7 +308,7 @@ static int usbd_ctrl_feed_dout(const struct device *dev,
 		return -ENOMEM;
 	}
 
-	net_buf_put(&cfg->fifo, buf);
+	k_fifo_put(&cfg->fifo, buf);
 	udc_nrf_clear_control_out(dev);
 
 	return 0;

drivers/usb/udc/udc_stm32.c

@@ -136,7 +136,7 @@ static int usbd_ctrl_feed_dout(const struct device *dev, const size_t length)
 		return -ENOMEM;
 	}
 
-	net_buf_put(&cfg->fifo, buf);
+	k_fifo_put(&cfg->fifo, buf);
 
 	HAL_PCD_EP_Receive(&priv->pcd, cfg->addr, buf->data, buf->size);
 

samples/bluetooth/hci_ipc/src/main.c

@@ -192,7 +192,7 @@ static void hci_ipc_rx(uint8_t *data, size_t len)
 	}
 
 	if (buf) {
-		net_buf_put(&tx_queue, buf);
+		k_fifo_put(&tx_queue, buf);
 
 		LOG_HEXDUMP_DBG(buf->data, buf->len, "Final net buffer:");
 	}
@@ -205,7 +205,7 @@ static void tx_thread(void *p1, void *p2, void *p3)
 		int err;
 
 		/* Wait until a buffer is available */
-		buf = net_buf_get(&tx_queue, K_FOREVER);
+		buf = k_fifo_get(&tx_queue, K_FOREVER);
 		/* Pass buffer to the stack */
 		err = bt_send(buf);
 		if (err) {
@@ -412,7 +412,7 @@ int main(void)
 	while (1) {
 		struct net_buf *buf;
 
-		buf = net_buf_get(&rx_queue, K_FOREVER);
+		buf = k_fifo_get(&rx_queue, K_FOREVER);
 		hci_ipc_send(buf, HCI_REGULAR_MSG);
 	}
 	return 0;

samples/bluetooth/hci_spi/src/main.c

@@ -317,7 +317,7 @@ int main(void)
 	}
 
 	while (1) {
-		buf = net_buf_get(&rx_queue, K_FOREVER);
+		buf = k_fifo_get(&rx_queue, K_FOREVER);
 		err = spi_send(buf);
 		if (err) {
 			LOG_ERR("Failed to send");