[PATCH net-next 2/8] net: macb: rename rx_skbuff into rx_buff
From: Paolo Valerio <hidden>
Date: 2026-01-15 22:26:11
Subsystem:
atmel macb ethernet driver, networking drivers, the rest · Maintainers:
Théo Lebrun, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
This is a preparation commit as the field in later patches will no longer accomomdate skbuffs, but more generic frames. Signed-off-by: Paolo Valerio <redacted> --- drivers/net/ethernet/cadence/macb.h | 2 +- drivers/net/ethernet/cadence/macb_main.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
index 2cb65ec37d44..3b184e9ac771 100644
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h@@ -1262,7 +1262,7 @@ struct macb_queue { unsigned int rx_tail; unsigned int rx_prepared_head; struct macb_dma_desc *rx_ring; - struct sk_buff **rx_skbuff; + void **rx_buff; void *rx_buffers; struct napi_struct napi_rx; struct queue_stats stats;
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 5947c2b44bb3..19782f3f46f2 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c@@ -1267,7 +1267,7 @@ static int gem_rx_refill(struct macb_queue *queue) desc = macb_rx_desc(queue, entry); - if (!queue->rx_skbuff[entry]) { + if (!queue->rx_buff[entry]) { /* allocate sk_buff for this free entry in ring */ skb = netdev_alloc_skb(bp->dev, bp->rx_buffer_size); if (unlikely(!skb)) {
@@ -1286,7 +1286,7 @@ static int gem_rx_refill(struct macb_queue *queue) break; } - queue->rx_skbuff[entry] = skb; + queue->rx_buff[entry] = skb; if (entry == bp->rx_ring_size - 1) paddr |= MACB_BIT(RX_WRAP);
@@ -1389,7 +1389,7 @@ static int gem_rx(struct macb_queue *queue, struct napi_struct *napi, queue->stats.rx_dropped++; break; } - skb = queue->rx_skbuff[entry]; + skb = queue->rx_buff[entry]; if (unlikely(!skb)) { netdev_err(bp->dev, "inconsistent Rx descriptor chain\n");
@@ -1398,7 +1398,7 @@ static int gem_rx(struct macb_queue *queue, struct napi_struct *napi, break; } /* now everything is ready for receiving packet */ - queue->rx_skbuff[entry] = NULL; + queue->rx_buff[entry] = NULL; len = ctrl & bp->rx_frm_len_mask; netdev_vdbg(bp->dev, "gem_rx %u (len %u)\n", entry, len);
@@ -2397,11 +2397,11 @@ static void gem_free_rx_buffers(struct macb *bp) int i; for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) { - if (!queue->rx_skbuff) + if (!queue->rx_buff) continue; for (i = 0; i < bp->rx_ring_size; i++) { - skb = queue->rx_skbuff[i]; + skb = queue->rx_buff[i]; if (!skb) continue;
@@ -2415,8 +2415,8 @@ static void gem_free_rx_buffers(struct macb *bp) skb = NULL; } - kfree(queue->rx_skbuff); - queue->rx_skbuff = NULL; + kfree(queue->rx_buff); + queue->rx_buff = NULL; } }
@@ -2479,13 +2479,13 @@ static int gem_alloc_rx_buffers(struct macb *bp) for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) { size = bp->rx_ring_size * sizeof(struct sk_buff *); - queue->rx_skbuff = kzalloc(size, GFP_KERNEL); - if (!queue->rx_skbuff) + queue->rx_buff = kzalloc(size, GFP_KERNEL); + if (!queue->rx_buff) return -ENOMEM; else netdev_dbg(bp->dev, - "Allocated %d RX struct sk_buff entries at %p\n", - bp->rx_ring_size, queue->rx_skbuff); + "Allocated %d RX buff entries at %p\n", + bp->rx_ring_size, queue->rx_buff); } return 0; }
--
2.52.0