net: Optionally use pxe client arch from variable

The client architecture that we pass to a dhcp server depends on the target
payload that we want to execute. An EFI binary has a different client arch
than a legacy binary or a u-boot binary.

So let's parameterize the pxe client arch field to allow an override via
the distro script, so that our efi boot path can tell the dhcp server that
it's actually an efi firmware.

Signed-off-by: Alexander Graf <agraf@suse.de>

diff --git a/net/bootp.c b/net/bootp.c
index 85dc524df4fdd8d3e8549b6bab751ab5aa24d0ff..aa6cdf0a47a5c17a36a711c62e72043890ce2465 100644 (file)
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -440,10 +440,10 @@ static int dhcp_extended(u8 *e, int message_type, struct in_addr server_ip,
 {
        u8 *start = e;
        u8 *cnt;
-#if defined(CONFIG_BOOTP_PXE)
+#ifdef CONFIG_LIB_UUID
        char *uuid;
-       u16 clientarch;
 #endif
+       int clientarch = -1;
 
 #if defined(CONFIG_BOOTP_VENDOREX)
        u8 *x;
@@ -499,12 +499,19 @@ static int dhcp_extended(u8 *e, int message_type, struct in_addr server_ip,
        }
 #endif
 
-#if defined(CONFIG_BOOTP_PXE)
+#ifdef CONFIG_BOOTP_PXE_CLIENTARCH
        clientarch = CONFIG_BOOTP_PXE_CLIENTARCH;
-       *e++ = 93;      /* Client System Architecture */
-       *e++ = 2;
-       *e++ = (clientarch >> 8) & 0xff;
-       *e++ = clientarch & 0xff;
+#endif
+
+       if (getenv("bootp_arch"))
+               clientarch = getenv_ulong("bootp_arch", 16, clientarch);
+
+       if (clientarch > 0) {
+               *e++ = 93;      /* Client System Architecture */
+               *e++ = 2;
+               *e++ = (clientarch >> 8) & 0xff;
+               *e++ = clientarch & 0xff;
+       }
 
        *e++ = 94;      /* Client Network Interface Identifier */
        *e++ = 3;
@@ -512,6 +519,7 @@ static int dhcp_extended(u8 *e, int message_type, struct in_addr server_ip,
        *e++ = 0;       /* major revision */
        *e++ = 0;       /* minor revision */
 
+#ifdef CONFIG_LIB_UUID
        uuid = getenv("pxeuuid");
 
        if (uuid) {