[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/5] NetRxPkt: Remove code duplication in net_rx_pkt
From: |
Dmitry Fleytman |
Subject: |
[Qemu-devel] [PATCH 5/5] NetRxPkt: Remove code duplication in net_rx_pkt_pull_data() |
Date: |
Thu, 16 Feb 2017 14:29:36 +0200 |
This is a refactoring commit that does not change behavior.
Signed-off-by: Dmitry Fleytman <address@hidden>
---
hw/net/net_rx_pkt.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/net/net_rx_pkt.c b/hw/net/net_rx_pkt.c
index c7ae33d..3899211 100644
--- a/hw/net/net_rx_pkt.c
+++ b/hw/net/net_rx_pkt.c
@@ -88,20 +88,21 @@ net_rx_pkt_pull_data(struct NetRxPkt *pkt,
const struct iovec *iov, int iovcnt,
size_t ploff)
{
+ uint32_t pllen = iov_size(iov, iovcnt) - ploff;
+
if (pkt->ehdr_buf_len) {
net_rx_pkt_iovec_realloc(pkt, iovcnt + 1);
pkt->vec[0].iov_base = pkt->ehdr_buf;
pkt->vec[0].iov_len = pkt->ehdr_buf_len;
- pkt->tot_len = iov_size(iov, iovcnt) - ploff + pkt->ehdr_buf_len;
+ pkt->tot_len = pllen + pkt->ehdr_buf_len;
pkt->vec_len = iov_copy(pkt->vec + 1, pkt->vec_len_total - 1,
- iov, iovcnt, ploff,
- pkt->tot_len - pkt->ehdr_buf_len) + 1;
+ iov, iovcnt, ploff, pllen) + 1;
} else {
net_rx_pkt_iovec_realloc(pkt, iovcnt);
- pkt->tot_len = iov_size(iov, iovcnt) - ploff;
+ pkt->tot_len = pllen;
pkt->vec_len = iov_copy(pkt->vec, pkt->vec_len_total,
iov, iovcnt, ploff, pkt->tot_len);
}
--
2.7.4
- [Qemu-devel] [PATCH 0/5] A few VLAN-related bugfixes for RX packet abstraction, Dmitry Fleytman, 2017/02/16
- [Qemu-devel] [PATCH 1/5] eth: Extend vlan stripping functions, Dmitry Fleytman, 2017/02/16
- [Qemu-devel] [PATCH 2/5] NetRxPkt: Fix memory corruption on VLAN header stripping, Dmitry Fleytman, 2017/02/16
- [Qemu-devel] [PATCH 3/5] NetRxPkt: Do not try to pull more data than present, Dmitry Fleytman, 2017/02/16
- [Qemu-devel] [PATCH 4/5] NetRxPkt: Account buffer with ETH header in IOV length, Dmitry Fleytman, 2017/02/16
- [Qemu-devel] [PATCH 5/5] NetRxPkt: Remove code duplication in net_rx_pkt_pull_data(),
Dmitry Fleytman <=
- Re: [Qemu-devel] [PATCH 0/5] A few VLAN-related bugfixes for RX packet abstraction, Peter Maydell, 2017/02/16
- Re: [Qemu-devel] [PATCH 0/5] A few VLAN-related bugfixes for RX packet abstraction, Jason Wang, 2017/02/16