diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-11-24 10:59:12 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-11-24 10:59:12 +0000 |
| commit | d536d9578ec3ac5029a70b8126cb84bb6f2124a4 (patch) | |
| tree | b0d7a180756d1560a4dfa4ff294fd8f573c07a23 /hw | |
| parent | 23895cbd82be95428e90168b12e925d0d3ca2f06 (diff) | |
| parent | 9925990d01a92564af55f6f69d0f5f59b47609b1 (diff) | |
| download | qemu-d536d9578ec3ac5029a70b8126cb84bb6f2124a4.zip qemu-d536d9578ec3ac5029a70b8126cb84bb6f2124a4.tar.gz qemu-d536d9578ec3ac5029a70b8126cb84bb6f2124a4.tar.bz2 | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Tue 24 Nov 2020 02:41:01 GMT
# gpg: using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>" [marginal]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211
* remotes/jasowang/tags/net-pull-request:
net: Use correct default-path macro for downscript
tap: fix a memory leak
net: purge queued rx packets on queue deletion
net: do not exit on "netdev_add help" monitor command
hw/net/e1000e: advance desc_offset in case of null descriptor
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/net/e1000e_core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index d8b9e4b..095c01e 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -1596,13 +1596,13 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct NetRxPkt *pkt, (const char *) &fcs_pad, e1000x_fcs_len(core->mac)); } } - desc_offset += desc_size; - if (desc_offset >= total_size) { - is_last = true; - } } else { /* as per intel docs; skip descriptors with null buf addr */ trace_e1000e_rx_null_descriptor(); } + desc_offset += desc_size; + if (desc_offset >= total_size) { + is_last = true; + } e1000e_write_rx_descr(core, desc, is_last ? core->rx_pkt : NULL, rss_info, do_ps ? ps_hdr_len : 0, &bastate.written); |