| Message ID | 1681155287-28437-2-git-send-email-emohandesi@linux.microsoft.com |
|---|---|
| State | Superseded |
| Delegated to: | Ramon Fried |
| Headers | show |
| Series | Add IPv6 Network Discovery | expand |
On Mon, 2023-04-10 at 12:34 -0700, emohandesi@linux.microsoft.com wrote: > > 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 > > Hello, Ehsan! Is everything ok with this patch set? You reverted the commit that is absent in upstream.
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 <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 >> >> > Hello, Ehsan! > > Is everything ok with this patch set? > You reverted the commit that is absent in upstream.
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 **/