aboutsummaryrefslogtreecommitdiff
path: root/networking/udhcp/options.c
diff options
context:
space:
mode:
authorRuss Dill <Russ.Dill@asu.edu>2003-12-15 22:09:36 +0000
committerRuss Dill <Russ.Dill@asu.edu>2003-12-15 22:09:36 +0000
commit4a9e34c14867430141c1e510847df0ec91060a5d (patch)
tree84fe7807595642f4469d98c0a2d7d4f691a52887 /networking/udhcp/options.c
parenta1fece2c70898a1180f0506df6695e3077510731 (diff)
downloadbusybox-w32-4a9e34c14867430141c1e510847df0ec91060a5d.tar.gz
busybox-w32-4a9e34c14867430141c1e510847df0ec91060a5d.tar.bz2
busybox-w32-4a9e34c14867430141c1e510847df0ec91060a5d.zip
options is a pretty common symbol, bad idea to use as a global in udhcp when compiling into busybox
Diffstat (limited to 'networking/udhcp/options.c')
-rw-r--r--networking/udhcp/options.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/networking/udhcp/options.c b/networking/udhcp/options.c
index a3edd0b8b..32deeabb3 100644
--- a/networking/udhcp/options.c
+++ b/networking/udhcp/options.c
@@ -13,7 +13,7 @@
13 13
14 14
15/* supported options are easily added here */ 15/* supported options are easily added here */
16struct dhcp_option options[] = { 16struct dhcp_option dhcp_options[] = {
17 /* name[10] flags code */ 17 /* name[10] flags code */
18 {"subnet", OPTION_IP | OPTION_REQ, 0x01}, 18 {"subnet", OPTION_IP | OPTION_REQ, 0x01},
19 {"timezone", OPTION_S32, 0x02}, 19 {"timezone", OPTION_S32, 0x02},
@@ -158,9 +158,9 @@ int add_simple_option(unsigned char *optionptr, unsigned char code, u_int32_t da
158 u16 = (u_int16_t *) &aligned; 158 u16 = (u_int16_t *) &aligned;
159 u32 = &aligned; 159 u32 = &aligned;
160 160
161 for (i = 0; options[i].code; i++) 161 for (i = 0; dhcp_options[i].code; i++)
162 if (options[i].code == code) { 162 if (dhcp_options[i].code == code) {
163 length = option_lengths[options[i].flags & TYPE_MASK]; 163 length = option_lengths[dhcp_options[i].flags & TYPE_MASK];
164 } 164 }
165 165
166 if (!length) { 166 if (!length) {