From b7d19cc400f14ccd64a1fedebe14022fe115029a Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 30 May 2010 23:41:23 +0200 Subject: dhcp: readability cleanups and small code shrink function old new delta udhcp_run_script 654 617 -37 Signed-off-by: Denys Vlasenko --- networking/udhcp/common.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'networking/udhcp/common.h') diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h index c9dd0bb25..75b787a80 100644 --- a/networking/udhcp/common.h +++ b/networking/udhcp/common.h @@ -57,10 +57,20 @@ struct ip_udp_dhcp_packet { struct dhcp_packet data; } PACKED; +struct udp_dhcp_packet { + struct udphdr udp; + struct dhcp_packet data; +} 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, + 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 BUG_bad_sizeof_struct_ip_udp_dhcp_packet - [(sizeof(struct ip_udp_dhcp_packet) != 576 + CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS) ? -1 : 1]; + char c[IP_UPD_DHCP_SIZE == 576 ? 1 : -1]; }; -- cgit v1.2.3