migration: Rename save_live_setup() to save_setup()

[qemu.git] / slirp / ip_output.c

diff --git a/slirp/ip_output.c b/slirp/ip_output.c
index 542f3180beb7ee99ab85cf8cc51d3f3b3e18671e..db403f04c1efc387f8f2461ca2a086373d119117 100644 (file)
--- a/slirp/ip_output.c
+++ b/slirp/ip_output.c
@@ -38,7 +38,8 @@
  * terms and conditions of the copyright.
  */
 
-#include <slirp.h>
+#include "qemu/osdep.h"
+#include "slirp.h"
 
 /* Number of packets queued before we start sending
  * (to prevent allocing too many mbufs) */
@@ -60,8 +61,8 @@ ip_output(struct socket *so, struct mbuf *m0)
        int len, off, error = 0;
 
        DEBUG_CALL("ip_output");
-       DEBUG_ARG("so = %lx", (long)so);
-       DEBUG_ARG("m0 = %lx", (long)m0);
+       DEBUG_ARG("so = %p", so);
+       DEBUG_ARG("m0 = %p", m0);
 
        ip = mtod(m, struct ip *);
        /*
@@ -159,7 +160,7 @@ sendorfree:
                if (error == 0)
                        if_output(so, m);
                else
-                       m_freem(m);
+                       m_free(m);
        }
     }
 
@@ -167,6 +168,6 @@ done:
        return (error);
 
 bad:
-       m_freem(m0);
+       m_free(m0);
        goto done;
 }