Merge remote-tracking branch 'quintela/thread-20121220.next' into staging

[qemu.git] / slirp / ip_input.c

diff --git a/slirp/ip_input.c b/slirp/ip_input.c
index ce24faf165f650e7ecb5c12c0fa965a284db1808..880bdfd3ccf43dcdabf324cb72a7545a79c4364e 100644 (file)
--- a/slirp/ip_input.c
+++ b/slirp/ip_input.c
@@ -39,7 +39,7 @@
  */
 
 #include <slirp.h>
-#include <osdep.h>
+#include <qemu/osdep.h>
 #include "ip_icmp.h"
 
 static struct ip *ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp);
@@ -213,7 +213,6 @@ ip_input(struct mbuf *m)
        return;
 bad:
        m_free(m);
-       return;
 }
 
 #define iptofrag(P) ((struct ipasfrag *)(((char*)(P)) - sizeof(struct qlink)))