From patchwork Mon May 16 19:25:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 9105501 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 068DBBF29F for ; Mon, 16 May 2016 19:25:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 693FB200E9 for ; Mon, 16 May 2016 19:25:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B6448200CF for ; Mon, 16 May 2016 19:25:54 +0000 (UTC) Received: from localhost ([::1]:46942 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2O9J-0007B5-1H for patchwork-qemu-devel@patchwork.kernel.org; Mon, 16 May 2016 15:25:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48280) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2O8w-00077O-L5 for qemu-devel@nongnu.org; Mon, 16 May 2016 15:25:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b2O8r-0004Nw-7z for qemu-devel@nongnu.org; Mon, 16 May 2016 15:25:29 -0400 Received: from hera.aquilenet.fr ([141.255.128.1]:54439) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2O8r-0004Mb-0s for qemu-devel@nongnu.org; Mon, 16 May 2016 15:25:25 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 2A3D6865C; Mon, 16 May 2016 21:25:21 +0200 (CEST) Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Mqu_Ro2d7y3I; Mon, 16 May 2016 21:25:21 +0200 (CEST) Received: from var.youpi.perso.aquilenet.fr (unknown [IPv6:2a01:cb19:1ba:5d00:3602:86ff:fe2c:6a19]) by hera.aquilenet.fr (Postfix) with ESMTPSA id D732D852B; Mon, 16 May 2016 21:25:20 +0200 (CEST) Received: from samy by var.youpi.perso.aquilenet.fr with local (Exim 4.87) (envelope-from ) id 1b2O8m-0006WA-NA; Mon, 16 May 2016 21:25:20 +0200 From: Samuel Thibault To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Mon, 16 May 2016 21:25:19 +0200 Message-Id: <1463426720-25008-4-git-send-email-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1463426720-25008-1-git-send-email-samuel.thibault@ens-lyon.org> References: <1463426720-25008-1-git-send-email-samuel.thibault@ens-lyon.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 141.255.128.1 Subject: [Qemu-devel] [PULL 3/4] slirp: Remove some unused code from slirp.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jan.kiszka@siemens.com, Thomas Huth , Samuel Thibault Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Thomas Huth These hunks are apparently not used anymore, so let's delete them. Signed-off-by: Thomas Huth Reviewed-by: Peter Maydell Signed-off-by: Samuel Thibault --- slirp/slirp.h | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/slirp/slirp.h b/slirp/slirp.h index 5b5df59..e373876 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -58,10 +58,6 @@ typedef char *caddr_t; # include #endif -#ifdef USE_PPP -#include -#endif - /* Avoid conflicting with the libc insque() and remque(), which have different prototypes. */ #define insque slirp_insque @@ -96,10 +92,6 @@ typedef char *caddr_t; #include "if.h" #include "main.h" #include "misc.h" -#ifdef USE_PPP -#include "ppp/pppd.h" -#include "ppp/ppp.h" -#endif #include "bootp.h" #include "tftp.h" @@ -237,18 +229,12 @@ extern Slirp *slirp_instance; #define NULL (void *)0 #endif -#ifndef FULL_BOLT void if_start(Slirp *); -#else -void if_start(struct ttys *); -#endif #ifndef _WIN32 #include #endif -#define DEFAULT_BAUD 115200 - #define SO_OPTIONS DO_KEEPALIVE #define TCP_MAXIDLE (TCPTV_KEEPCNT * TCPTV_KEEPINTVL) @@ -306,14 +292,6 @@ int tcp_emu(struct socket *, struct mbuf *); int tcp_ctl(struct socket *); struct tcpcb *tcp_drop(struct tcpcb *tp, int err); -#ifdef USE_PPP -#define MIN_MRU MINMRU -#define MAX_MRU MAXMRU -#else -#define MIN_MRU 128 -#define MAX_MRU 16384 -#endif - #ifndef _WIN32 #define min(x,y) ((x) < (y) ? (x) : (y)) #define max(x,y) ((x) > (y) ? (x) : (y))