summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2009-06-24 14:42:30 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-06-29 08:52:49 -0500
commitb5302e1a9d8a47bd29a3e1876fba34be111728a2 (patch)
treefb8bf68a679b723f0435a0d0d8e2282131f93dcc
parentf1d99bbdcd395651e9c1ee71825e29b503f4129a (diff)
downloadfocaccia-qemu-b5302e1a9d8a47bd29a3e1876fba34be111728a2.tar.gz
focaccia-qemu-b5302e1a9d8a47bd29a3e1876fba34be111728a2.zip
slirp: Drop link_up checks from if_output and slirp_socket_can_recv
link_up is true once slirp is initialized, so these check are really not
required.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--slirp/if.c5
-rw-r--r--slirp/slirp.c3
2 files changed, 1 insertions, 7 deletions
diff --git a/slirp/if.c b/slirp/if.c
index 1ef4bf963a..58ab4c7aca 100644
--- a/slirp/if.c
+++ b/slirp/if.c
@@ -138,10 +138,7 @@ diddit:
 	/*
 	 * This prevents us from malloc()ing too many mbufs
 	 */
-	if (link_up) {
-		/* if_start will check towrite */
-		if_start();
-	}
+	if_start();
 #endif
 }
 
diff --git a/slirp/slirp.c b/slirp/slirp.c
index 9b51c0b010..71f79a3630 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -824,9 +824,6 @@ size_t slirp_socket_can_recv(struct in_addr guest_addr, int guest_port)
 	struct iovec iov[2];
 	struct socket *so;
 
-    if (!link_up)
-        return 0;
-
 	so = slirp_find_ctl_socket(guest_addr, guest_port);
 
 	if (!so || so->so_state & SS_NOFDREF)