| Message ID | 1305606559-29993-1-git-send-email-judge.packham@gmail.com |
|---|---|
| State | Accepted |
| Commit | 09e3a67dec72b85dfc5535d2dbe695e9b2bfc4f9 |
| Headers | show |
Dear Chris Packham, In message <1305606559-29993-1-git-send-email-judge.packham@gmail.com> you wrote: > From: Luuk Paulussen <luuk.paulussen@alliedtelesis.co.nz> > > Signed-off-by: Luuk Paulussen <luuk.paulussen@alliedtelesis.co.nz> > Acked-by: Chris Packham <chris.packham@alliedtelesis.co.nz> > Cc: Ben Warren <biggerbadderben@gmail.com> > --- > Changes since v1: > - fixed compile error in BootpVendorProcess when CONFIG_CMD_SNTP is not > defined > Changes since v2: > - run though checkpatch.pl. Address comments from Sergei. > > net/bootp.c | 15 +++++++++++++++ > 1 files changed, 15 insertions(+), 0 deletions(-) Applied, thanks. Best regards, Wolfgang Denk
diff --git a/net/bootp.c b/net/bootp.c index 4db63cb..45eaab1 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -228,6 +228,11 @@ static void BootpVendorFieldProcess (u8 * ext) NetOurNISDomain[size] = 0; } break; +#if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_NTPSERVER) + case 42: /* NTP server IP */ + NetCopyIP(&NetNtpServerIP, (IPaddr_t *) (ext + 2)); + break; +#endif /* Application layer fields */ case 43: /* Vendor specific info - Not yet supported */ /* @@ -278,6 +283,11 @@ static void BootpVendorProcess (u8 * ext, int size) if (NetBootFileSize) debug("NetBootFileSize: %d\n", NetBootFileSize); + +#if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_NTPSERVER) + if (NetNtpServerIP) + debug("NetNtpServerIP : %pI4\n", &NetNtpServerIP); +#endif } /* * Handle a BOOTP received packet. @@ -538,6 +548,11 @@ static int BootpExtended (u8 * e) *e++ = 32; e += 32; #endif +#if defined(CONFIG_BOOTP_NTPSERVER) + *e++ = 42; + *e++ = 4; + e += 4; +#endif *e++ = 255; /* End of the list */