diff options
| author | Simon Glass <sjg@chromium.org> | 2021-12-18 11:27:52 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-01-21 14:01:35 -0500 |
| commit | 434075393d7c41457662d996418e5acd0f3da0cb (patch) | |
| tree | d77ccb4bb319c372ddf350f1d299f68231e0c5f4 /net | |
| parent | d3877fba3172486245f02f1b027f3069de891ca7 (diff) | |
net: Drop #ifdefs with CONFIG_BOOTP_SERVERIP
Use IS_ENABLED() instead, to reduce the number of build paths.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bootp.c | 5 | ||||
| -rw-r--r-- | net/net.c | 24 |
2 files changed, 15 insertions, 14 deletions
diff --git a/net/bootp.c b/net/bootp.c index 58e30cd6b0..d83e4eb0ba 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -148,10 +148,12 @@ static int check_reply_packet(uchar *pkt, unsigned dest, unsigned src, static void store_bootp_params(struct bootp_hdr *bp) { -#if !defined(CONFIG_BOOTP_SERVERIP) struct in_addr tmp_ip; bool overwrite_serverip = true; + if (IS_ENABLED(CONFIG_BOOTP_SERVERIP)) + return; + #if defined(CONFIG_BOOTP_PREFER_SERVERIP) overwrite_serverip = false; #endif @@ -179,7 +181,6 @@ static void store_bootp_params(struct bootp_hdr *bp) */ if (*net_boot_file_name) env_set("bootfile", net_boot_file_name); -#endif } /* @@ -302,12 +302,12 @@ void net_auto_load(void) if (s != NULL && strcmp(s, "NFS") == 0) { if (net_check_prereq(NFS)) { /* We aren't expecting to get a serverip, so just accept the assigned IP */ -#ifdef CONFIG_BOOTP_SERVERIP - net_set_state(NETLOOP_SUCCESS); -#else - printf("Cannot autoload with NFS\n"); - net_set_state(NETLOOP_FAIL); -#endif + if (IS_ENABLED(CONFIG_BOOTP_SERVERIP)) { + net_set_state(NETLOOP_SUCCESS); + } else { + printf("Cannot autoload with NFS\n"); + net_set_state(NETLOOP_FAIL); + } return; } /* @@ -327,12 +327,12 @@ void net_auto_load(void) } if (net_check_prereq(TFTPGET)) { /* We aren't expecting to get a serverip, so just accept the assigned IP */ -#ifdef CONFIG_BOOTP_SERVERIP - net_set_state(NETLOOP_SUCCESS); -#else - printf("Cannot autoload with TFTPGET\n"); - net_set_state(NETLOOP_FAIL); -#endif + if (IS_ENABLED(CONFIG_BOOTP_SERVERIP)) { + net_set_state(NETLOOP_SUCCESS); + } else { + printf("Cannot autoload with TFTPGET\n"); + net_set_state(NETLOOP_FAIL); + } return; } tftp_start(TFTPGET); |