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 0D782C76196 for ; Tue, 11 Apr 2023 14:51:18 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C10ED85AA1; Tue, 11 Apr 2023 16:51:15 +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="ISh8sNeJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 55A9B85B61; Tue, 11 Apr 2023 16:51:13 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by phobos.denx.de (Postfix) with ESMTP id AF4568574A for ; Tue, 11 Apr 2023 16:51:10 +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 [192.168.0.167] (c-73-183-134-76.hsd1.tx.comcast.net [73.183.134.76]) by linux.microsoft.com (Postfix) with ESMTPSA id 96D5A21779A1; Tue, 11 Apr 2023 07:51:08 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 96D5A21779A1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1681224669; bh=ZoKNo6deRgLFNv5FFOfxe8cqPyE0pKbG+NbgQbQuAJQ=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=ISh8sNeJCdCkvQ2bl4jVWAwZKMIQSi7+ljTVPtP1sxAW2mFJMHFqaQ6VAdd7i7kEp q1cNPqt+GL14dwcMk/zvl93pDK+xYf/AxnQOSE9Led610amvv203IPhyqOr2SP4Bh1 fFRSCKAZy6yLl7GZOEQuefBocr4iWOhf9Tqu77Kk= Subject: Re: [PATCH v2 1/4] Revert "net: ipv6: Add support for default gateway discovery." To: "Vyacheslav V. Mitrofanov" , "u-boot@lists.denx.de" Cc: "joe.hershberger@ni.com" , "xypron.glpk@gmx.de" , "tobias@waldekranz.com" , "saproj@gmail.com" , "rfried.dev@gmail.com" , "ilias.apalodimas@linaro.org" , "mario.six@gdsys.cc" , "john@metanate.com" , "sjg@chromium.org" , "masahisa.kojima@linaro.org" References: <1677776290-11067-1-git-send-email-emohandesi@linux.microsoft.com> <1681155287-28437-1-git-send-email-emohandesi@linux.microsoft.com> <1681155287-28437-2-git-send-email-emohandesi@linux.microsoft.com> <3ab87827402f3b6e3cf2b47cf45501e726cf7914.camel@yadro.com> From: Ehsan Mohandesi Message-ID: <2c065fb3-feae-0ca3-6e5d-0c1e1b4e867e@linux.microsoft.com> Date: Tue, 11 Apr 2023 09:51:07 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <3ab87827402f3b6e3cf2b47cf45501e726cf7914.camel@yadro.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US 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 You are right, Viacheslav. I should not have included the revert commit in my patch. I think I need to remove it and send a v3 of my patch series. On 4/11/2023 2:01 AM, Vyacheslav V. Mitrofanov wrote: > On Mon, 2023-04-10 at 12:34 -0700, emohandesi@linux.microsoft.com > wrote: >> 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 >> >> > Hello, Ehsan! > > Is everything ok with this patch set? > You reverted the commit that is absent in upstream.