diff options
| author | Tom Rini <[email protected]> | 2023-01-10 11:19:45 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-01-20 12:27:24 -0500 |
| commit | 6e7df1d151a7a127caf3b62ff6dfc003fc2aefcd (patch) | |
| tree | ae38e9dcf468b2e4e58293561fae87895d9b549f /net/bootp.c | |
| parent | ad242344681f6a0076a6bf100aa83ac9ecbea355 (diff) | |
global: Finish CONFIG -> CFG migration
At this point, the remaining places where we have a symbol that is
defined as CONFIG_... are in fairly odd locations. While as much dead
code has been removed as possible, some of these locations are simply
less obvious at first. In other cases, this code is used, but was
defined in such a way as to have been missed by earlier checks. Perform
a rename of all such remaining symbols to be CFG_... rather than
CONFIG_...
Signed-off-by: Tom Rini <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
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 7ac0093945c..cae041988db 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 |