Patchwork [9/9] eepro100: Simplify receive data structure

login
register
mail settings
Submitter Stefan Weil
Date March 31, 2011, 8:33 p.m.
Message ID <1301603611-7964-10-git-send-email-weil@mail.berlios.de>
Download mbox | patch
Permalink /patch/89129/
State Superseded
Headers show

Comments

Stefan Weil - March 31, 2011, 8:33 p.m.
The packet data part of this structure was only used to calculate
the size of the preceding data. This can be simplified.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 hw/eepro100.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/hw/eepro100.c b/hw/eepro100.c
index a740d2e..d4d315b 100644
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -180,7 +180,7 @@  typedef struct {
     uint32_t rx_buf_addr;       /* void * */
     uint16_t count;
     uint16_t size;
-    char packet[MAX_ETH_FRAME_SIZE + 4];
+    /* Ethernet frame data follows. */
 } eepro100_rx_t;
 
 typedef enum {
@@ -1859,7 +1859,7 @@  static ssize_t nic_receive(VLANClientState *nc, const uint8_t * buf, size_t size
     /* !!! */
     eepro100_rx_t rx;
     cpu_physical_memory_read(s->ru_base + s->ru_offset, (uint8_t *) & rx,
-                             offsetof(eepro100_rx_t, packet));
+                             sizeof(eepro100_rx_t));
     uint16_t rfd_command = le16_to_cpu(rx.command);
     uint16_t rfd_size = le16_to_cpu(rx.size);
 
@@ -1893,7 +1893,7 @@  static ssize_t nic_receive(VLANClientState *nc, const uint8_t * buf, size_t size
     assert(!(s->configuration[17] & BIT(0)));
 #endif
     cpu_physical_memory_write(s->ru_base + s->ru_offset +
-                              offsetof(eepro100_rx_t, packet), buf, size);
+                              sizeof(eepro100_rx_t), buf, size);
     s->statistics.rx_good_frames++;
     eepro100_fr_interrupt(s);
     s->ru_offset = le32_to_cpu(rx.link);