public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
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	[thread overview]
Message-ID: <1681155287-28437-2-git-send-email-emohandesi@linux.microsoft.com> (raw)
In-Reply-To: <1681155287-28437-1-git-send-email-emohandesi@linux.microsoft.com>

From: Ehsan Mohandesi <emohandesi@microsoft.com>

This reverts commit 0af1035a55d9c1486b2db43ee70ff0a63affd4f4.

Signed-off-by: Ehsan Mohandesi <emohandesi@microsoft.com>

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 <net/tcp.h>
 #include <net/wget.h>
+#if defined(CONFIG_CMD_DHCP6)
+#include "dhcpv6.h"
+#endif
 
 /** BOOTP EXTENTIONS **/
 
-- 
1.8.3.1


  reply	other threads:[~2023-04-10 19:36 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-02 16:58 [PATCH] net: ipv6: Add support for default gateway discovery emohandesi
2023-03-16  8:47 ` Vyacheslav V. Mitrofanov
2023-03-23 16:44   ` Ehsan Mohandesi
2023-03-23 16:59     ` Vyacheslav V. Mitrofanov
2023-04-01 19:02 ` Ramon Fried
2023-04-10 19:34 ` [PATCH v2 0/4] Add IPv6 Network Discovery emohandesi
2023-04-10 19:34   ` emohandesi [this message]
2023-04-11  7:01     ` [PATCH v2 1/4] Revert "net: ipv6: Add support for default gateway discovery." Vyacheslav V. Mitrofanov
2023-04-11 14:51       ` Ehsan Mohandesi
2023-04-10 19:34   ` [PATCH v2 2/4] net: ipv6: Add support for default gateway discovery emohandesi
2023-04-10 19:34   ` [PATCH v2 3/4] test/py: IPv6 network discovery test emohandesi
2023-04-10 19:34   ` [PATCH v2 4/4] test: eth: IPv6 network discovery unit test emohandesi
2023-04-12 16:10 ` [PATCH v3 0/3] Add IPv6 Network Discovery emohandesi
2023-04-12 16:10   ` [PATCH v3 1/3] net: ipv6: Add support for default gateway discovery emohandesi
2023-04-20 13:44     ` Vyacheslav V. Mitrofanov
2023-04-12 16:10   ` [PATCH v3 2/3] test/py: IPv6 network discovery test emohandesi
2023-04-19  1:46     ` Simon Glass
2023-04-12 16:10   ` [PATCH v3 3/3] test: eth: IPv6 network discovery unit test emohandesi
2023-04-19  1:46     ` Simon Glass
2023-04-22  0:08 ` [PATCH v4 0/3] Add IPv6 Network Discovery emohandesi
2023-04-22  0:08   ` [PATCH v4 1/3] net: ipv6: Add support for default gateway discovery emohandesi
2023-04-24  7:58     ` Vyacheslav V. Mitrofanov
2023-04-24  8:03     ` Vyacheslav V. Mitrofanov
2023-05-04 14:30     ` Sergei Antonov
2023-05-04 14:52     ` Sergei Antonov
2023-05-05 14:13       ` Ehsan Mohandesi
2023-05-06 14:53     ` Tom Rini
2023-05-10 10:05       ` Sergei Antonov
2023-05-10 11:16         ` Vyacheslav V. Mitrofanov
2023-04-22  0:08   ` [PATCH v4 2/3] test/py: IPv6 network discovery test emohandesi
2023-04-24  7:59     ` Vyacheslav V. Mitrofanov
2023-05-06 14:53     ` Tom Rini
2023-04-22  0:08   ` [PATCH v4 3/3] test: eth: IPv6 network discovery unit test emohandesi
2023-04-24  8:01     ` Vyacheslav V. Mitrofanov
2023-05-06 14:53     ` Tom Rini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1681155287-28437-2-git-send-email-emohandesi@linux.microsoft.com \
    --to=emohandesi@linux.microsoft.com \
    --cc=ilias.apalodimas@linaro.org \
    --cc=joe.hershberger@ni.com \
    --cc=john@metanate.com \
    --cc=mario.six@gdsys.cc \
    --cc=masahisa.kojima@linaro.org \
    --cc=rfried.dev@gmail.com \
    --cc=saproj@gmail.com \
    --cc=sjg@chromium.org \
    --cc=tobias@waldekranz.com \
    --cc=u-boot@lists.denx.de \
    --cc=v.v.mitrofanov@yadro.com \
    --cc=xypron.glpk@gmx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox