diff options
| -rw-r--r-- | networking/udhcp/common.h | 6 | ||||
| -rw-r--r-- | networking/udhcp/packet.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h index 9020b9c96..f8f18ff01 100644 --- a/networking/udhcp/common.h +++ b/networking/udhcp/common.h @@ -63,14 +63,14 @@ struct udp_dhcp_packet { } PACKED; enum { - IP_UPD_DHCP_SIZE = sizeof(struct ip_udp_dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS, - UPD_DHCP_SIZE = sizeof(struct udp_dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS, + IP_UDP_DHCP_SIZE = sizeof(struct ip_udp_dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS, + UDP_DHCP_SIZE = sizeof(struct udp_dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS, DHCP_SIZE = sizeof(struct dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS, }; /* Let's see whether compiler understood us right */ struct BUG_bad_sizeof_struct_ip_udp_dhcp_packet { - char c[IP_UPD_DHCP_SIZE == 576 ? 1 : -1]; + char c[IP_UDP_DHCP_SIZE == 576 ? 1 : -1]; }; diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c index d8f9c5daa..2b7528cc7 100644 --- a/networking/udhcp/packet.c +++ b/networking/udhcp/packet.c @@ -216,19 +216,19 @@ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt, packet.udp.source = htons(source_port); packet.udp.dest = htons(dest_port); /* size, excluding IP header: */ - packet.udp.len = htons(UPD_DHCP_SIZE - padding); + packet.udp.len = htons(UDP_DHCP_SIZE - padding); /* for UDP checksumming, ip.len is set to UDP packet len */ packet.ip.tot_len = packet.udp.len; - packet.udp.check = udhcp_checksum(&packet, IP_UPD_DHCP_SIZE - padding); + packet.udp.check = udhcp_checksum(&packet, IP_UDP_DHCP_SIZE - padding); /* but for sending, it is set to IP packet len */ - packet.ip.tot_len = htons(IP_UPD_DHCP_SIZE - padding); + packet.ip.tot_len = htons(IP_UDP_DHCP_SIZE - padding); packet.ip.ihl = sizeof(packet.ip) >> 2; packet.ip.version = IPVERSION; packet.ip.ttl = IPDEFTTL; packet.ip.check = udhcp_checksum(&packet.ip, sizeof(packet.ip)); udhcp_dump_packet(dhcp_pkt); - result = sendto(fd, &packet, IP_UPD_DHCP_SIZE - padding, /*flags:*/ 0, + result = sendto(fd, &packet, IP_UDP_DHCP_SIZE - padding, /*flags:*/ 0, (struct sockaddr *) &dest_sll, sizeof(dest_sll)); msg = "sendto"; ret_close: |