From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50340) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SYhUz-0008MU-Pm for qemu-devel@nongnu.org; Sun, 27 May 2012 13:43:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SYhUx-0000tA-VF for qemu-devel@nongnu.org; Sun, 27 May 2012 13:43:25 -0400 Received: from mout.web.de ([212.227.15.3]:61740) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SYhUx-0000sy-MR for qemu-devel@nongnu.org; Sun, 27 May 2012 13:43:23 -0400 Message-ID: <4FC267AF.3060706@web.de> Date: Sun, 27 May 2012 19:43:11 +0200 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <1335565745-22708-1-git-send-email-afaerber@suse.de> In-Reply-To: <1335565745-22708-1-git-send-email-afaerber@suse.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH for-1.1] slirp: Untangle TCPOLEN_* from TCPOPT_* List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jan Kiszka , Blue Swirl , Anthony Liguori Cc: Lee Essen , Paolo Bonzini , qemu-devel@nongnu.org Am 28.04.2012 00:29, schrieb Andreas Färber: > From: Andreas Färber > > Commit b72210568ef0c0fb141a01cffb71a09c4efa0364 (slirp: clean up > conflicts with system headers) enclosed TCPOLEN_MAXSEG with an #ifdef > TCPOPT_EOL. This broke the build on illumos, which has TCPOPT_* > but not TCPOLEN_*. > > Move them to their own #ifdef TCPOLEN_MAXSEG section to remedy this. > > Cc: Paolo Bonzini > Signed-off-by: Andreas Färber Ping! It seems this patch has not been applied yet despite agreement between Blue and Jan that we should apply this least-invasive version for 1.1. Please apply / include in a PULL for rc4. Andreas > --- > slirp/tcp.h | 13 ++++++++----- > 1 files changed, 8 insertions(+), 5 deletions(-) > > diff --git a/slirp/tcp.h b/slirp/tcp.h > index 8299603..2e2b403 100644 > --- a/slirp/tcp.h > +++ b/slirp/tcp.h > @@ -79,20 +79,23 @@ struct tcphdr { > #define TCPOPT_EOL 0 > #define TCPOPT_NOP 1 > #define TCPOPT_MAXSEG 2 > -#define TCPOLEN_MAXSEG 4 > #define TCPOPT_WINDOW 3 > -#define TCPOLEN_WINDOW 3 > #define TCPOPT_SACK_PERMITTED 4 /* Experimental */ > -#define TCPOLEN_SACK_PERMITTED 2 > #define TCPOPT_SACK 5 /* Experimental */ > #define TCPOPT_TIMESTAMP 8 > -#define TCPOLEN_TIMESTAMP 10 > -#define TCPOLEN_TSTAMP_APPA (TCPOLEN_TIMESTAMP+2) /* appendix A */ > > #define TCPOPT_TSTAMP_HDR \ > (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP) > #endif > > +#ifndef TCPOLEN_MAXSEG > +#define TCPOLEN_MAXSEG 4 > +#define TCPOLEN_WINDOW 3 > +#define TCPOLEN_SACK_PERMITTED 2 > +#define TCPOLEN_TIMESTAMP 10 > +#define TCPOLEN_TSTAMP_APPA (TCPOLEN_TIMESTAMP+2) /* appendix A */ > +#endif > + > /* > * Default maximum segment size for TCP. > * With an IP MSS of 576, this is 536,