From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D8FCEC76196 for ; Mon, 10 Apr 2023 19:36:06 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0856485DA9; Mon, 10 Apr 2023 21:35:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="J/9n7mpH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 14CBB8450D; Mon, 10 Apr 2023 21:35:20 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by phobos.denx.de (Postfix) with ESMTP id EDD4D85CF6 for ; Mon, 10 Apr 2023 21:35:11 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=emohandesi@linux.microsoft.com Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 16A1E2174E39; Mon, 10 Apr 2023 12:35:10 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 16A1E2174E39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1681155310; bh=X/jS1620OrtB/iAi4/7nMFsMo5v9UN0ytHpPT6x/xfI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J/9n7mpHInQa/eKFXdwWFkuC0dln1IdDqCfGnYCNPdnVxqAKtawtBCUUHez+/FY+9 F85ypeXfPIKbt0bBFOdgUD0mgpJyF4eKxtS9PT0kaAAidpPw5p6WwKKV1SOyGonTVT kDNbYs7yfJpZd8N1/G9bSu34EFy04jhIkg6X83/8= From: emohandesi@linux.microsoft.com To: u-boot@lists.denx.de Cc: joe.hershberger@ni.com, rfried.dev@gmail.com, sjg@chromium.org, xypron.glpk@gmx.de, ilias.apalodimas@linaro.org, masahisa.kojima@linaro.org, tobias@waldekranz.com, john@metanate.com, v.v.mitrofanov@yadro.com, saproj@gmail.com, mario.six@gdsys.cc Subject: [PATCH v2 1/4] Revert "net: ipv6: Add support for default gateway discovery." Date: Mon, 10 Apr 2023 12:34:44 -0700 Message-Id: <1681155287-28437-2-git-send-email-emohandesi@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1681155287-28437-1-git-send-email-emohandesi@linux.microsoft.com> References: <1677776290-11067-1-git-send-email-emohandesi@linux.microsoft.com> <1681155287-28437-1-git-send-email-emohandesi@linux.microsoft.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean From: Ehsan Mohandesi This reverts commit 0af1035a55d9c1486b2db43ee70ff0a63affd4f4. Signed-off-by: Ehsan Mohandesi Conflicts: cmd/Kconfig include/net.h include/net6.h net/net.c --- include/net.h | 4 ++-- net/net.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/net.h b/include/net.h index 399af5e..8ba50a0 100644 --- a/include/net.h +++ b/include/net.h @@ -504,8 +504,8 @@ extern ushort net_native_vlan; /* Our Native VLAN */ extern int net_restart_wrap; /* Tried all network devices */ enum proto_t { - BOOTP, RARP, ARP, TFTPGET, DHCP, PING, PING6, DNS, NFS, CDP, NETCONS, - SNTP, TFTPSRV, TFTPPUT, LINKLOCAL, FASTBOOT, WOL, UDP, NCSI, WGET + BOOTP, RARP, ARP, TFTPGET, DHCP, DHCP6, PING, PING6, DNS, NFS, CDP, + NETCONS, SNTP, TFTPSRV, TFTPPUT, LINKLOCAL, FASTBOOT, WOL, UDP, NCSI, WGET }; extern char net_boot_file_name[1024];/* Boot File name */ diff --git a/net/net.c b/net/net.c index c9a749f..d69bfb0 100644 --- a/net/net.c +++ b/net/net.c @@ -122,6 +122,9 @@ #endif #include #include +#if defined(CONFIG_CMD_DHCP6) +#include "dhcpv6.h" +#endif /** BOOTP EXTENTIONS **/ -- 1.8.3.1