diff options
| author | Michael Brown | 2010-11-30 01:31:01 +0100 |
|---|---|---|
| committer | Michael Brown | 2011-01-10 04:39:26 +0100 |
| commit | 310d46c1edcefeb918125de0ee2e123c2940a70b (patch) | |
| tree | d0e326375e3f3ec1ac93cc3b2831f9beb45b52f3 /src/include | |
| parent | [dhcp] Remove redundant length fields in struct dhcp_packet (diff) | |
| download | ipxe-310d46c1edcefeb918125de0ee2e123c2940a70b.tar.gz ipxe-310d46c1edcefeb918125de0ee2e123c2940a70b.tar.xz ipxe-310d46c1edcefeb918125de0ee2e123c2940a70b.zip | |
[dhcp] Rename length fields for DHCP options
Rename "len" to "used_len" and "max_len" to "alloc_len".
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ipxe/dhcpopts.h | 10 | ||||
| -rw-r--r-- | src/include/ipxe/dhcppkt.h | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/include/ipxe/dhcpopts.h b/src/include/ipxe/dhcpopts.h index fea99d59d..d88036e3a 100644 --- a/src/include/ipxe/dhcpopts.h +++ b/src/include/ipxe/dhcpopts.h @@ -15,10 +15,10 @@ FILE_LICENCE ( GPL2_OR_LATER ); struct dhcp_options { /** Option block raw data */ void *data; - /** Option block length */ - size_t len; - /** Option block maximum length */ - size_t max_len; + /** Option block used length */ + size_t used_len; + /** Option block allocated length */ + size_t alloc_len; }; extern int dhcpopt_store ( struct dhcp_options *options, unsigned int tag, @@ -29,6 +29,6 @@ extern int dhcpopt_extensible_store ( struct dhcp_options *options, extern int dhcpopt_fetch ( struct dhcp_options *options, unsigned int tag, void *data, size_t len ); extern void dhcpopt_init ( struct dhcp_options *options, - void *data, size_t max_len ); + void *data, size_t alloc_len ); #endif /* _IPXE_DHCPOPTS_H */ diff --git a/src/include/ipxe/dhcppkt.h b/src/include/ipxe/dhcppkt.h index b004800d8..3179a6bb0 100644 --- a/src/include/ipxe/dhcppkt.h +++ b/src/include/ipxe/dhcppkt.h @@ -57,7 +57,8 @@ dhcppkt_put ( struct dhcp_packet *dhcppkt ) { * @ret len Used length */ static inline int dhcppkt_len ( struct dhcp_packet *dhcppkt ) { - return ( offsetof ( struct dhcphdr, options ) + dhcppkt->options.len ); + return ( offsetof ( struct dhcphdr, options ) + + dhcppkt->options.used_len ); } extern int dhcppkt_store ( struct dhcp_packet *dhcppkt, unsigned int tag, |