|
@@ -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);
|
|
|
}
|
|
|
}
|
|
|
|