diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-20 14:21:38 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-20 14:21:38 -0500 |
| commit | 0b9b01517f0b1398ec27dbb47faf3645b719e02c (patch) | |
| tree | fac11441ba4056e75d3b59811da3b0a91d1cfcf5 /net/bootp.c | |
| parent | 8bd3c0a7e17ee17c771cabc0e548a1a436ac021d (diff) | |
| parent | 6333acb961b6fcaa60c6e5b623d676b332481cfa (diff) | |
Merge branch '2023-01-20-finish-CONFIG-migration-work'
- Merge in the final batch of CONFIG to Kconfig/CFG migration work. This
includes a fix for a number of ns16550 or similar UARTs due to a
migration bug. We also pull in a revert for enabling CONFIG_VIDEO on
tools-only_defconfig.
Diffstat (limited to 'net/bootp.c')
| -rw-r--r-- | net/bootp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/bootp.c b/net/bootp.c index 7ac0093945..cae041988d 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -44,15 +44,15 @@ #define PORT_BOOTPS 67 /* BOOTP server UDP port */ #define PORT_BOOTPC 68 /* BOOTP client UDP port */ -#ifndef CONFIG_DHCP_MIN_EXT_LEN /* minimal length of extension list */ -#define CONFIG_DHCP_MIN_EXT_LEN 64 +#ifndef CFG_DHCP_MIN_EXT_LEN /* minimal length of extension list */ +#define CFG_DHCP_MIN_EXT_LEN 64 #endif -#ifndef CONFIG_BOOTP_ID_CACHE_SIZE -#define CONFIG_BOOTP_ID_CACHE_SIZE 4 +#ifndef CFG_BOOTP_ID_CACHE_SIZE +#define CFG_BOOTP_ID_CACHE_SIZE 4 #endif -u32 bootp_ids[CONFIG_BOOTP_ID_CACHE_SIZE]; +u32 bootp_ids[CFG_BOOTP_ID_CACHE_SIZE]; unsigned int bootp_num_ids; int bootp_try; ulong bootp_start; @@ -611,8 +611,8 @@ static int dhcp_extended(u8 *e, int message_type, struct in_addr server_ip, *e++ = 255; /* End of the list */ /* Pad to minimal length */ -#ifdef CONFIG_DHCP_MIN_EXT_LEN - while ((e - start) < CONFIG_DHCP_MIN_EXT_LEN) +#ifdef CFG_DHCP_MIN_EXT_LEN + while ((e - start) < CFG_DHCP_MIN_EXT_LEN) *e++ = 0; #endif |