diff options
| author | Tom Rini <trini@konsulko.com> | 2022-01-21 14:01:41 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-01-21 14:01:41 -0500 |
| commit | e6786b0354372c8a68d01e4d633a19cdce373b70 (patch) | |
| tree | 027e1693c9765fe67f3879d2e65d38ac695dde98 /net/arp.c | |
| parent | 2d7a463e82daeba4f6a7fb59bac0fe94d6f6d3a2 (diff) | |
| parent | 3425decf5299bb7d3ce12d7f8e43cd2d49b9cad6 (diff) | |
Merge branch '2022-01-21-Kconfig-migrations'
- Migrate CONFIG_KEEP_SERVERADDR, CONFIG_UDP_CHECKSUM, CONFIG_TIMESTAMP,
CONFIG_BOOTP_SERVERIP, CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR,
CONFIG_SYS_MAX_FLASH_BANKS_DETECT, CONFIG_SYS_MAX_FLASH_BANKS and
CONFIG_AT91_EFLASH to Kconfig
Diffstat (limited to 'net/arp.c')
| -rw-r--r-- | net/arp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/arp.c b/net/arp.c index 1d06ed25722..0b086dc8d21 100644 --- a/net/arp.c +++ b/net/arp.c @@ -196,13 +196,12 @@ void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) if (!arp_is_waiting()) break; -#ifdef CONFIG_KEEP_SERVERADDR - if (net_server_ip.s_addr == net_arp_wait_packet_ip.s_addr) { + if (IS_ENABLED(CONFIG_KEEP_SERVERADDR) && + net_server_ip.s_addr == net_arp_wait_packet_ip.s_addr) { char buf[20]; sprintf(buf, "%pM", &arp->ar_sha); env_set("serveraddr", buf); } -#endif reply_ip_addr = net_read_ip(&arp->ar_spa); |