mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-14 15:02:54 +00:00
e1000e: rename e1000e_ba_state and e1000e_write_hdr_to_rx_buffers
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>
This commit is contained in:
parent
560cf339b2
commit
e710f9c470
|
@ -1397,15 +1397,15 @@ 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];
|
uint16_t written[MAX_PS_BUFFERS];
|
||||||
uint8_t cur_idx;
|
uint8_t cur_idx;
|
||||||
} e1000e_ba_state;
|
} E1000EBAState;
|
||||||
|
|
||||||
static inline void
|
static inline void
|
||||||
e1000e_write_hdr_to_rx_buffers(E1000ECore *core,
|
e1000e_write_hdr_frag_to_rx_buffers(E1000ECore *core,
|
||||||
hwaddr ba[MAX_PS_BUFFERS],
|
hwaddr ba[MAX_PS_BUFFERS],
|
||||||
e1000e_ba_state *bastate,
|
E1000EBAState *bastate,
|
||||||
const char *data,
|
const char *data,
|
||||||
dma_addr_t data_len)
|
dma_addr_t data_len)
|
||||||
{
|
{
|
||||||
|
@ -1420,7 +1420,7 @@ e1000e_write_hdr_to_rx_buffers(E1000ECore *core,
|
||||||
static void
|
static void
|
||||||
e1000e_write_payload_frag_to_rx_buffers(E1000ECore *core,
|
e1000e_write_payload_frag_to_rx_buffers(E1000ECore *core,
|
||||||
hwaddr ba[MAX_PS_BUFFERS],
|
hwaddr ba[MAX_PS_BUFFERS],
|
||||||
e1000e_ba_state *bastate,
|
E1000EBAState *bastate,
|
||||||
const char *data,
|
const char *data,
|
||||||
dma_addr_t data_len)
|
dma_addr_t data_len)
|
||||||
{
|
{
|
||||||
|
@ -1530,7 +1530,7 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct NetRxPkt *pkt,
|
||||||
|
|
||||||
do {
|
do {
|
||||||
hwaddr ba[MAX_PS_BUFFERS];
|
hwaddr ba[MAX_PS_BUFFERS];
|
||||||
e1000e_ba_state bastate = { { 0 } };
|
E1000EBAState bastate = { { 0 } };
|
||||||
bool is_last = false;
|
bool is_last = false;
|
||||||
|
|
||||||
desc_size = total_size - desc_offset;
|
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_copy = MIN(ps_hdr_len - ps_hdr_copied,
|
||||||
iov->iov_len - iov_ofs);
|
iov->iov_len - iov_ofs);
|
||||||
|
|
||||||
e1000e_write_hdr_to_rx_buffers(core, ba, &bastate,
|
e1000e_write_hdr_frag_to_rx_buffers(core, ba,
|
||||||
iov->iov_base, iov_copy);
|
&bastate,
|
||||||
|
iov->iov_base,
|
||||||
|
iov_copy);
|
||||||
|
|
||||||
copy_size -= iov_copy;
|
copy_size -= iov_copy;
|
||||||
ps_hdr_copied += iov_copy;
|
ps_hdr_copied += iov_copy;
|
||||||
|
@ -1585,7 +1587,7 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct NetRxPkt *pkt,
|
||||||
} else {
|
} else {
|
||||||
/* Leave buffer 0 of each descriptor except first */
|
/* Leave buffer 0 of each descriptor except first */
|
||||||
/* empty as per spec 7.1.5.1 */
|
/* empty as per spec 7.1.5.1 */
|
||||||
e1000e_write_hdr_to_rx_buffers(core, ba, &bastate,
|
e1000e_write_hdr_frag_to_rx_buffers(core, ba, &bastate,
|
||||||
NULL, 0);
|
NULL, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue