summary refs log tree commit diff stats
path: root/slirp/ip_output.c
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2009-06-24 14:42:29 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-06-29 08:52:46 -0500
commit0d62c4cfe21752df4c1d6e2c2398f15d5eaa794a (patch)
tree17797b80174a0d19f756ca3255b709d3b191cf7a /slirp/ip_output.c
parent6dbe553fe9ffdee008c1bbbe1af2d030e0f04aab (diff)
downloadfocaccia-qemu-0d62c4cfe21752df4c1d6e2c2398f15d5eaa794a.tar.gz
focaccia-qemu-0d62c4cfe21752df4c1d6e2c2398f15d5eaa794a.zip
slirp: Drop dead code
After all its years inside the qemu tree, there is no point in keeping
the dead code paths of slirp. This patch is a first round of removing
usually commented out code parts. More cleanups need to follow (and
maybe finally a proper reindention).

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'slirp/ip_output.c')
-rw-r--r--slirp/ip_output.c23
1 files changed, 0 insertions, 23 deletions
diff --git a/slirp/ip_output.c b/slirp/ip_output.c
index 5bce520612..94bb0f27eb 100644
--- a/slirp/ip_output.c
+++ b/slirp/ip_output.c
@@ -64,12 +64,6 @@ ip_output(struct socket *so, struct mbuf *m0)
 	DEBUG_ARG("so = %lx", (long)so);
 	DEBUG_ARG("m0 = %lx", (long)m0);
 
-	/* We do no options */
-/*	if (opt) {
- *		m = ip_insertoptions(m, opt, &len);
- *		hlen = len;
- *	}
- */
 	ip = mtod(m, struct ip *);
 	/*
 	 * Fill in IP header.
@@ -81,17 +75,6 @@ ip_output(struct socket *so, struct mbuf *m0)
 	STAT(ipstat.ips_localout++);
 
 	/*
-	 * Verify that we have any chance at all of being able to queue
-	 *      the packet or packet fragments
-	 */
-	/* XXX Hmmm... */
-/*	if (if_queued > IF_THRESH && towrite <= 0) {
- *		error = ENOBUFS;
- *		goto bad;
- *	}
- */
-
-	/*
 	 * If small enough for interface, can just send directly.
 	 */
 	if ((u_int16_t)ip->ip_len <= IF_MTU) {
@@ -142,12 +125,6 @@ ip_output(struct socket *so, struct mbuf *m0)
 	  mhip = mtod(m, struct ip *);
 	  *mhip = *ip;
 
-		/* No options */
-/*		if (hlen > sizeof (struct ip)) {
- *			mhlen = ip_optcopy(ip, mhip) + sizeof (struct ip);
- *			mhip->ip_hl = mhlen >> 2;
- *		}
- */
 	  m->m_len = mhlen;
 	  mhip->ip_off = ((off - hlen) >> 3) + (ip->ip_off & ~IP_MF);
 	  if (ip->ip_off & IP_MF)