Skip to content

Commit cbe6575

Browse files
vlrplnbuchwitz
authored andcommitted
net: macb: make macb_tx_skb generic
The macb_tx_skb structure is renamed to macb_tx_buff with no functional changes. This is a preparatory step for adding xdp xmit support. Signed-off-by: Paolo Valerio <pvalerio@redhat.com>
1 parent 3e1f045 commit cbe6575

File tree

2 files changed

+157
-67
lines changed

2 files changed

+157
-67
lines changed

drivers/net/ethernet/cadence/macb.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -988,15 +988,15 @@ struct macb_dma_desc_ptp {
988988
/* Scaled PPM fraction */
989989
#define PPM_FRACTION 16
990990

991-
/* struct macb_tx_skb - data about an skb which is being transmitted
991+
/* struct macb_tx_buff - data about an skb which is being transmitted
992992
* @skb: skb currently being transmitted, only set for the last buffer
993993
* of the frame
994994
* @mapping: DMA address of the skb's fragment buffer
995995
* @size: size of the DMA mapped buffer
996996
* @mapped_as_page: true when buffer was mapped with skb_frag_dma_map(),
997997
* false when buffer was mapped with dma_map_single()
998998
*/
999-
struct macb_tx_skb {
999+
struct macb_tx_buff {
10001000
struct sk_buff *skb;
10011001
dma_addr_t mapping;
10021002
size_t size;
@@ -1290,7 +1290,7 @@ struct macb_queue {
12901290
spinlock_t tx_ptr_lock;
12911291
unsigned int tx_head, tx_tail;
12921292
struct macb_dma_desc *tx_ring;
1293-
struct macb_tx_skb *tx_skb;
1293+
struct macb_tx_buff *tx_buff;
12941294
dma_addr_t tx_ring_dma;
12951295
struct work_struct tx_error_task;
12961296
bool txubr_pending;
@@ -1376,7 +1376,7 @@ struct macb {
13761376
int phy_reset_ms;
13771377

13781378
/* AT91RM9200 transmit queue (1 on wire + 1 queued) */
1379-
struct macb_tx_skb rm9200_txq[2];
1379+
struct macb_tx_buff rm9200_txq[2];
13801380
unsigned int max_tx_length;
13811381

13821382
u64 ethtool_stats[GEM_STATS_LEN + QUEUE_STATS_LEN * MACB_MAX_QUEUES];

0 commit comments

Comments
 (0)