From patchwork Tue Feb 5 18:28:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 10798233 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CF897746 for ; Tue, 5 Feb 2019 19:42:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BD2BD2C8AD for ; Tue, 5 Feb 2019 19:42:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B1C932C974; Tue, 5 Feb 2019 19:42:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 611BB2C972 for ; Tue, 5 Feb 2019 19:42:43 +0000 (UTC) Received: from localhost ([127.0.0.1]:39059 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr6cE-0006Hd-Eh for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Feb 2019 14:42:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42421) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr5TE-0005Db-EH for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:29:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gr5TD-0005iS-Bx for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:29:20 -0500 Received: from hera.aquilenet.fr ([2a0c:e300::1]:42848) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gr5TD-0005de-3u for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:29:19 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id A88E1C11D; Tue, 5 Feb 2019 19:29:15 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr 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 mJ1eI4biJ7Nw; Tue, 5 Feb 2019 19:29:14 +0100 (CET) Received: from function (unknown [188.164.201.34]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 4E1D6C12C; Tue, 5 Feb 2019 19:28:56 +0100 (CET) Received: from samy by function with local (Exim 4.92-RC4) (envelope-from ) id 1gr5Sk-0007nw-1f; Tue, 05 Feb 2019 19:28:50 +0100 From: Samuel Thibault To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Tue, 5 Feb 2019 20:28:37 +0200 Message-Id: <20190205182848.29887-22-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190205182848.29887-1-samuel.thibault@ens-lyon.org> References: <20190205182848.29887-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a0c:e300::1 Subject: [Qemu-devel] [PULLv3 21/32] slirp: replace net/eth.h inclusion with own defines 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: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Samuel Thibault , stefanha@redhat.com, jan.kiszka@siemens.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Samuel Thibault --- slirp/ip6.h | 1 - slirp/slirp.h | 1 - slirp/util.h | 10 ++++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/slirp/ip6.h b/slirp/ip6.h index 1e3e329ce6..4e7c366505 100644 --- a/slirp/ip6.h +++ b/slirp/ip6.h @@ -7,7 +7,6 @@ #define SLIRP_IP6_H #include -#include "net/eth.h" #define ALLNODES_MULTICAST { .s6_addr = \ { 0xff, 0x02, 0x00, 0x00,\ diff --git a/slirp/slirp.h b/slirp/slirp.h index 5707805be2..c9f9143801 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -48,7 +48,6 @@ typedef char *caddr_t; #include "util.h" #include "qemu/queue.h" -#include "net/eth.h" #include "libslirp.h" #include "ip.h" diff --git a/slirp/util.h b/slirp/util.h index 4664e8159b..ef75804560 100644 --- a/slirp/util.h +++ b/slirp/util.h @@ -50,6 +50,16 @@ #define SCALE_MS 1000000 +#define ETH_ALEN 6 +#define ETH_HLEN 14 +#define ETH_P_IP (0x0800) /* Internet Protocol packet */ +#define ETH_P_ARP (0x0806) /* Address Resolution packet */ +#define ETH_P_IPV6 (0x86dd) +#define ETH_P_VLAN (0x8100) +#define ETH_P_DVLAN (0x88a8) +#define ETH_P_NCSI (0x88f8) +#define ETH_P_UNKNOWN (0xffff) + #ifdef _WIN32 int slirp_closesocket(int fd); int slirp_ioctlsocket(int fd, int req, void *val);