diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-05-17 11:40:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-05-17 11:40:23 +0100 |
| commit | e48a748fc899bbd9bfa63f08ebb83f1c31b7bb7d (patch) | |
| tree | 3c3161c8572933d260b4a087b227e248a00caf6a /hw/net/e1000.c | |
| parent | b0f9690e78827d55a508c73432c73f057f59fd41 (diff) | |
| parent | 78e4f446d2569210a8558946b2321f9ff2ef47f6 (diff) | |
| download | focaccia-qemu-e48a748fc899bbd9bfa63f08ebb83f1c31b7bb7d.tar.gz focaccia-qemu-e48a748fc899bbd9bfa63f08ebb83f1c31b7bb7d.zip | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Fri 17 May 2019 10:01:18 BST # 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/colo-compare.c: Fix a crash in COLO Primary. net/slirp: fix the IPv6 prefix length error message e1000: Never increment the RX undersize count register vhost_net: don't set backend for the uninitialized virtqueue Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/e1000.c')
| -rw-r--r-- | hw/net/e1000.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 9b39bccfb2..121452d508 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -901,7 +901,6 @@ e1000_receive_iov(NetClientState *nc, const struct iovec *iov, int iovcnt) if (size < sizeof(min_buf)) { iov_to_buf(iov, iovcnt, 0, min_buf, size); memset(&min_buf[size], 0, sizeof(min_buf) - size); - e1000x_inc_reg_if_not_full(s->mac_reg, RUC); min_iov.iov_base = filter_buf = min_buf; min_iov.iov_len = size = sizeof(min_buf); iovcnt = 1; |