diff options
| author | Peter Maydell | 2017-11-20 15:54:16 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-11-20 15:54:16 +0100 |
| commit | c014817e215fd925bce5ce94b13ac87a6c3f03f8 (patch) | |
| tree | 99cfbbb8af89fdc5a9b1cb46ebf9b5bffb7413a3 /hw/net/e1000.c | |
| parent | Revert "cpu-exec: don't overwrite exception_index" (diff) | |
| parent | hw/net/vmxnet3: Fix code to work on big endian hosts, too (diff) | |
| download | qemu-c014817e215fd925bce5ce94b13ac87a6c3f03f8.tar.gz qemu-c014817e215fd925bce5ce94b13ac87a6c3f03f8.tar.xz qemu-c014817e215fd925bce5ce94b13ac87a6c3f03f8.zip | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Mon 20 Nov 2017 03:28:54 GMT
# gpg: using RSA key 0xEF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# 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:
hw/net/vmxnet3: Fix code to work on big endian hosts, too
net: Transmit zero UDP checksum as 0xFFFF
MAINTAINERS: Add missing entry for eepro100 emulation
hw/net/eepro100: Fix endianness problem on big endian hosts
Revert "Add new PCI ID for i82559a"
colo-compare: fix the dangerous assignment
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/e1000.c')
| -rw-r--r-- | hw/net/e1000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/net/e1000.c b/hw/net/e1000.c index c0abee4f7e..05a00cba31 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -503,7 +503,7 @@ putsum(uint8_t *data, uint32_t n, uint32_t sloc, uint32_t css, uint32_t cse) n = cse + 1; if (sloc < n-1) { sum = net_checksum_add(n-css, data+css); - stw_be_p(data + sloc, net_checksum_finish(sum)); + stw_be_p(data + sloc, net_checksum_finish_nozero(sum)); } } |