Merge remote-tracking branch 'bonzini/iommu-for-anthony' into staging

[qemu.git] / slirp / udp.c

diff --git a/slirp/udp.c b/slirp/udp.c
index ced509656d63362678285738b48d43d65d976fb4..b105f871f377a02074c6436a6f62bef5cedc4d32 100644 (file)
--- a/slirp/udp.c
+++ b/slirp/udp.c
@@ -231,7 +231,6 @@ udp_input(register struct mbuf *m, int iphlen)
        return;
 bad:
        m_free(m);
-       return;
 }
 
 int udp_output2(struct socket *so, struct mbuf *m,
@@ -373,7 +372,7 @@ udp_listen(Slirp *slirp, uint32_t haddr, u_int hport, uint32_t laddr,
                udp_detach(so);
                return NULL;
        }
-       setsockopt(so->s,SOL_SOCKET,SO_REUSEADDR,(char *)&opt,sizeof(int));
+       qemu_setsockopt(so->s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(int));
 
        getsockname(so->s,(struct sockaddr *)&addr,&addrlen);
        so->so_fport = addr.sin_port;