From 434075393d7c41457662d996418e5acd0f3da0cb Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 18 Dec 2021 11:27:52 -0700 Subject: net: Drop #ifdefs with CONFIG_BOOTP_SERVERIP Use IS_ENABLED() instead, to reduce the number of build paths. Signed-off-by: Simon Glass Reviewed-by: Ramon Fried --- net/bootp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'net/bootp.c') diff --git a/net/bootp.c b/net/bootp.c index 58e30cd..d83e4eb 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 } /* -- cgit v1.1