From: bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed, 10 May 2006 19:21:58 +0000 (+0000)
Subject: suppressed unaligned accesses
X-Git-Tag: release_0_8_2~158
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=38f3e7c2f526fb70d7bc52ed62910fea506dc84f;p=thirdparty%2Fqemu.git

suppressed unaligned accesses


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1911 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/slirp/if.c b/slirp/if.c
index 2ce9a6424fb..94132ca888b 100644
--- a/slirp/if.c
+++ b/slirp/if.c
@@ -52,8 +52,8 @@ if_init()
 	if_maxlinkhdr = 40;
 #endif
 #else
-        /* 14 for ethernet + 40 */
-        if_maxlinkhdr = 14 + 40;
+        /* 2 for alignment, 14 for ethernet, 40 for TCP/IP */
+        if_maxlinkhdr = 2 + 14 + 40;
 #endif
 	if_mtu = 1500;
 	if_mru = 1500;
diff --git a/slirp/slirp.c b/slirp/slirp.c
index e88745e8aaa..6ba753e7358 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -610,11 +610,12 @@ void slirp_input(const uint8_t *pkt, int pkt_len)
         m = m_get();
         if (!m)
             return;
-        m->m_len = pkt_len;
-        memcpy(m->m_data, pkt, pkt_len);
+        /* Note: we add to align the IP header */
+        m->m_len = pkt_len + 2;
+        memcpy(m->m_data + 2, pkt, pkt_len);
 
-        m->m_data += ETH_HLEN;
-        m->m_len -= ETH_HLEN;
+        m->m_data += 2 + ETH_HLEN;
+        m->m_len -= 2 + ETH_HLEN;
 
         ip_input(m);
         break;