Re: [U-Boot] [PATCH v4 1/5] net/bootp: add VCI support for BOOTP also

[Joe Hershberger]

Hi Ilya,

On Sun, Aug 5, 2012 at 4:21 PM, Ilya Yanok
ilya.ya...@cogentembedded.com wrote:
 Vendor Class Identifier option is common to BOOTP and DHCP and
 can be useful without PXE. So send VCI in both BOOTP and DHCP
 requests if CONFIG_BOOTP_VCI_STRING is defined.

 Signed-off-by: Ilya Yanok ilya.ya...@cogentembedded.com

 ---

Acked-by: Joe Hershberger joe.hershber...@ni.com
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH v4 1/5] net/bootp: add VCI support for BOOTP also

[Ilya Yanok]

Hi Joe,

On Mon, Aug 6, 2012 at 1:21 AM, Ilya Yanok ilya.ya...@cogentembedded.comwrote:

 Vendor Class Identifier option is common to BOOTP and DHCP and
 can be useful without PXE. So send VCI in both BOOTP and DHCP
 requests if CONFIG_BOOTP_VCI_STRING is defined.

 Signed-off-by: Ilya Yanok ilya.ya...@cogentembedded.com

 ---
 Changes in v4:
  - moved vci_strlen var inside macro
  - used strlen instead of sizeof


Is it ok now? What about the rest of the series?

Regards, Ilya.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH v4 1/5] net/bootp: add VCI support for BOOTP also

[Ilya Yanok]

Vendor Class Identifier option is common to BOOTP and DHCP and
can be useful without PXE. So send VCI in both BOOTP and DHCP
requests if CONFIG_BOOTP_VCI_STRING is defined.

Signed-off-by: Ilya Yanok ilya.ya...@cogentembedded.com

---
Changes in v4:
 - moved vci_strlen var inside macro
 - used strlen instead of sizeof

 net/bootp.c |   22 --
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/net/bootp.c b/net/bootp.c
index c9b8349..35b2e77 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -341,6 +341,15 @@ BootpTimeout(void)
}
 }
 
+#define put_vci(e, str)\
+   do {\
+   size_t vci_strlen = strlen(str);\
+   *e++ = 60;  /* Vendor Class Identifier */   \
+   *e++ = vci_strlen;  \
+   memcpy(e, str, vci_strlen); \
+   e += vci_strlen;\
+   } while (0)
+
 /*
  * Initialize BOOTP extension fields in the request.
  */
@@ -352,7 +361,6 @@ static int DhcpExtended(u8 *e, int message_type, IPaddr_t 
ServerID,
u8 *cnt;
 #if defined(CONFIG_BOOTP_PXE)
char *uuid;
-   size_t vci_strlen;
u16 clientarch;
 #endif
 
@@ -437,12 +445,10 @@ static int DhcpExtended(u8 *e, int message_type, IPaddr_t 
ServerID,
printf(Invalid pxeuuid: %s\n, uuid);
}
}
+#endif
 
-   *e++ = 60;  /* Vendor Class Identifier */
-   vci_strlen = strlen(CONFIG_BOOTP_VCI_STRING);
-   *e++ = vci_strlen;
-   memcpy(e, CONFIG_BOOTP_VCI_STRING, vci_strlen);
-   e += vci_strlen;
+#ifdef CONFIG_BOOTP_VCI_STRING
+   put_vci(e, CONFIG_VCI_STRING);
 #endif
 
 #if defined(CONFIG_BOOTP_VENDOREX)
@@ -529,6 +535,10 @@ static int BootpExtended(u8 *e)
*e++ = (576 - 312 + OPT_FIELD_SIZE)  0xff;
 #endif
 
+#ifdef CONFIG_BOOTP_VCI_STRING
+   put_vci(e, CONFIG_VCI_STRING);
+#endif
+
 #if defined(CONFIG_BOOTP_SUBNETMASK)
*e++ = 1;   /* Subnet mask request */
*e++ = 4;
-- 
1.7.9.5

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot