]> Git Repo - qemu.git/commitdiff
hw/net/eepro100: Fix endianness problem on big endian hosts
authorThomas Huth <[email protected]>
Thu, 16 Nov 2017 21:16:54 +0000 (22:16 +0100)
committerJason Wang <[email protected]>
Mon, 20 Nov 2017 03:08:00 +0000 (11:08 +0800)
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 <[email protected]>
Signed-off-by: Jason Wang <[email protected]>
hw/net/eepro100.c

index 91dd05801037027cb0bda6edb8fba582847c76ed..1c0def555bff29fa165c388bd36788a205eaea2e 100644 (file)
@@ -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;
This page took 0.029991 seconds and 4 git commands to generate.