| Message ID | 1332891788-17308-6-git-send-email-joe.hershberger@ni.com |
|---|---|
| State | Accepted |
| Commit | f9623229fdc22e591f1bf63eada1c0c93a199426 |
| Delegated to: | Joe Hershberger |
| Headers | show |
On Tue, Mar 27, 2012 at 4:42 PM, Joe Hershberger <joe.hershberger@ni.com> wrote: > Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> > Cc: Joe Hershberger <joe.hershberger@gmail.com> > Cc: Simon Glass <sjg@chromium.org> > Cc: Mike Frysinger <vapier@gentoo.org> Acked-by: Simon Glass <sjg@chromium.org> > --- > Changes for v2: > - Split from "Refactor bootp packet length computations" > > net/bootp.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/net/bootp.c b/net/bootp.c > index caa6d03..2eeb14e 100644 > --- a/net/bootp.c > +++ b/net/bootp.c > @@ -850,10 +850,10 @@ static void DhcpSendRequestPkt(struct Bootp_t *bp_offer) > pktlen = eth_hdr_size + IP_UDP_HDR_SIZE + iplen; > net_set_udp_header(iphdr, 0xFFFFFFFFL, PORT_BOOTPS, PORT_BOOTPC, iplen); > > - debug("Transmitting DHCPREQUEST packet: len = %d\n", pktlen); > #ifdef CONFIG_BOOTP_DHCP_REQUEST_DELAY > udelay(CONFIG_BOOTP_DHCP_REQUEST_DELAY); > #endif /* CONFIG_BOOTP_DHCP_REQUEST_DELAY */ > + debug("Transmitting DHCPREQUEST packet: len = %d\n", pktlen); > NetSendPacket(NetTxPacket, pktlen); > } > > -- > 1.6.0.2 >
diff --git a/net/bootp.c b/net/bootp.c index caa6d03..2eeb14e 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -850,10 +850,10 @@ static void DhcpSendRequestPkt(struct Bootp_t *bp_offer) pktlen = eth_hdr_size + IP_UDP_HDR_SIZE + iplen; net_set_udp_header(iphdr, 0xFFFFFFFFL, PORT_BOOTPS, PORT_BOOTPC, iplen); - debug("Transmitting DHCPREQUEST packet: len = %d\n", pktlen); #ifdef CONFIG_BOOTP_DHCP_REQUEST_DELAY udelay(CONFIG_BOOTP_DHCP_REQUEST_DELAY); #endif /* CONFIG_BOOTP_DHCP_REQUEST_DELAY */ + debug("Transmitting DHCPREQUEST packet: len = %d\n", pktlen); NetSendPacket(NetTxPacket, pktlen); }
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Cc: Joe Hershberger <joe.hershberger@gmail.com> Cc: Simon Glass <sjg@chromium.org> Cc: Mike Frysinger <vapier@gentoo.org> --- Changes for v2: - Split from "Refactor bootp packet length computations" net/bootp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)