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 2ce9a6424fb9024c71dfc84e9e833c143cc15d68..94132ca888b8e97254aa3c2d3bc632fecead549b 100644 (file)
--- 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 e88745e8aaa90b07b505feacf89d6871795bcf0d..6ba753e73580facef67b4ffcb2a8b19f5cb180fd 100644 (file)
--- 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;