[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL V2 11/17] e1000e: rename e1000e_ba_state and e1000e_write_hdr_to_r
From: |
Jason Wang |
Subject: |
[PULL V2 11/17] e1000e: rename e1000e_ba_state and e1000e_write_hdr_to_rx_buffers |
Date: |
Mon, 18 Sep 2023 16:31:26 +0800 |
From: Tomasz Dzieciol <t.dzieciol@partner.samsung.com>
Rename e1000e_ba_state according and e1000e_write_hdr_to_rx_buffers for
consistency with IGB.
Signed-off-by: Tomasz Dzieciol <t.dzieciol@partner.samsung.com>
Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Tested-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
hw/net/e1000e_core.c | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c
index cc243b7..e324c02 100644
--- a/hw/net/e1000e_core.c
+++ b/hw/net/e1000e_core.c
@@ -1397,17 +1397,17 @@ e1000e_pci_dma_write_rx_desc(E1000ECore *core,
dma_addr_t addr,
}
}
-typedef struct e1000e_ba_state_st {
+typedef struct E1000EBAState {
uint16_t written[MAX_PS_BUFFERS];
uint8_t cur_idx;
-} e1000e_ba_state;
+} E1000EBAState;
static inline void
-e1000e_write_hdr_to_rx_buffers(E1000ECore *core,
- hwaddr ba[MAX_PS_BUFFERS],
- e1000e_ba_state *bastate,
- const char *data,
- dma_addr_t data_len)
+e1000e_write_hdr_frag_to_rx_buffers(E1000ECore *core,
+ hwaddr ba[MAX_PS_BUFFERS],
+ E1000EBAState *bastate,
+ const char *data,
+ dma_addr_t data_len)
{
assert(data_len <= core->rxbuf_sizes[0] - bastate->written[0]);
@@ -1420,7 +1420,7 @@ e1000e_write_hdr_to_rx_buffers(E1000ECore *core,
static void
e1000e_write_payload_frag_to_rx_buffers(E1000ECore *core,
hwaddr ba[MAX_PS_BUFFERS],
- e1000e_ba_state *bastate,
+ E1000EBAState *bastate,
const char *data,
dma_addr_t data_len)
{
@@ -1530,7 +1530,7 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct
NetRxPkt *pkt,
do {
hwaddr ba[MAX_PS_BUFFERS];
- e1000e_ba_state bastate = { { 0 } };
+ E1000EBAState bastate = { { 0 } };
bool is_last = false;
desc_size = total_size - desc_offset;
@@ -1568,8 +1568,10 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct
NetRxPkt *pkt,
iov_copy = MIN(ps_hdr_len - ps_hdr_copied,
iov->iov_len - iov_ofs);
- e1000e_write_hdr_to_rx_buffers(core, ba, &bastate,
- iov->iov_base, iov_copy);
+ e1000e_write_hdr_frag_to_rx_buffers(core, ba,
+ &bastate,
+ iov->iov_base,
+ iov_copy);
copy_size -= iov_copy;
ps_hdr_copied += iov_copy;
@@ -1585,8 +1587,8 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct
NetRxPkt *pkt,
} else {
/* Leave buffer 0 of each descriptor except first */
/* empty as per spec 7.1.5.1 */
- e1000e_write_hdr_to_rx_buffers(core, ba, &bastate,
- NULL, 0);
+ e1000e_write_hdr_frag_to_rx_buffers(core, ba, &bastate,
+ NULL, 0);
}
}
--
2.7.4
- [PULL V2 01/17] tap: Add USO support to tap device., (continued)
- [PULL V2 01/17] tap: Add USO support to tap device., Jason Wang, 2023/09/18
- [PULL V2 02/17] tap: Add check for USO features, Jason Wang, 2023/09/18
- [PULL V2 03/17] virtio-net: Add USO flags to vhost support., Jason Wang, 2023/09/18
- [PULL V2 05/17] igb: remove TCP ACK detection, Jason Wang, 2023/09/18
- [PULL V2 04/17] virtio-net: Add support for USO features, Jason Wang, 2023/09/18
- [PULL V2 09/17] igb: add IPv6 extended headers traffic detection, Jason Wang, 2023/09/18
- [PULL V2 06/17] igb: rename E1000E_RingInfo_st, Jason Wang, 2023/09/18
- [PULL V2 07/17] igb: RX descriptors guest writting refactoring, Jason Wang, 2023/09/18
- [PULL V2 08/17] igb: RX payload guest writting refactoring, Jason Wang, 2023/09/18
- [PULL V2 10/17] igb: packet-split descriptors support, Jason Wang, 2023/09/18
- [PULL V2 11/17] e1000e: rename e1000e_ba_state and e1000e_write_hdr_to_rx_buffers,
Jason Wang <=
- [PULL V2 14/17] hw/net/fsl_etsec/rings.c: Avoid variable length array, Jason Wang, 2023/09/18
- [PULL V2 16/17] net/dump: Avoid variable length array, Jason Wang, 2023/09/18
- [PULL V2 15/17] hw/net/rocker: Avoid variable length array, Jason Wang, 2023/09/18
- [PULL V2 12/17] tests: bump libvirt-ci for libasan and libxdp, Jason Wang, 2023/09/18
- [PULL V2 13/17] net: add initial support for AF_XDP network backend, Jason Wang, 2023/09/18
- [PULL V2 17/17] net/tap: Avoid variable-length array, Jason Wang, 2023/09/18
- Re: [PULL V2 00/17] Net patches, Stefan Hajnoczi, 2023/09/19