aboutsummaryrefslogtreecommitdiff
path: root/hw/net
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2017-11-16 22:16:54 +0100
committerJason Wang <jasowang@redhat.com>2017-11-20 11:08:00 +0800
commit8f8e8053d9cc9f64f739ad64fa6ac83a4d9555f6 (patch)
tree53a20a0771fa06b4a34fe36cdeb52a0af6c63be3 /hw/net
parent2ec405524e85a1f6caba49dbb1fdf7c56e732b00 (diff)
hw/net/eepro100: Fix endianness problem on big endian hosts
Since commit 1865e288a823c764cd4344d ("Fix eepro100 simple transmission mode"), the test/pxe-test is broken for the eepro100 device on big endian hosts. However, it seems like that commit did not introduce the problem, but just uncovered it: The EEPRO100State->tx.tbd_array_addr and EEPRO100State->tx.tcb_bytes fields are already in host byte order, since they have already been byte-swapped in the read_cb() function. Thus byte-swapping them in tx_command() again results in the wrong endianness. Removing the byte-swapping here fixes the pxe-test. Signed-off-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'hw/net')
-rw-r--r--hw/net/eepro100.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
index 91dd058010..1c0def555b 100644
--- a/hw/net/eepro100.c
+++ b/hw/net/eepro100.c
@@ -754,8 +754,8 @@ static void read_cb(EEPRO100State *s)
static void tx_command(EEPRO100State *s)
{
- uint32_t tbd_array = le32_to_cpu(s->tx.tbd_array_addr);
- uint16_t tcb_bytes = (le16_to_cpu(s->tx.tcb_bytes) & 0x3fff);
+ uint32_t tbd_array = s->tx.tbd_array_addr;
+ uint16_t tcb_bytes = s->tx.tcb_bytes & 0x3fff;
/* Sends larger than MAX_ETH_FRAME_SIZE are allowed, up to 2600 bytes. */
uint8_t buf[2600];
uint16_t size = 0;