diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-12-27 18:03:20 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-12-27 18:03:20 +0100 |
commit | 3d27d435dbe7d39894257894b9dd32bfa607604c (patch) | |
tree | ddf5842839edb7c826ed54efa37d736c68750a2b /networking | |
parent | 2beb1f6fafc341f571501829fc17773f2e0ddbbf (diff) | |
download | busybox-w32-3d27d435dbe7d39894257894b9dd32bfa607604c.tar.gz busybox-w32-3d27d435dbe7d39894257894b9dd32bfa607604c.tar.bz2 busybox-w32-3d27d435dbe7d39894257894b9dd32bfa607604c.zip |
randomconfig fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
-rw-r--r-- | networking/nbd-client.c | 6 | ||||
-rw-r--r-- | networking/udhcp/dhcpd.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/networking/nbd-client.c b/networking/nbd-client.c index 103756b59..1ce974db1 100644 --- a/networking/nbd-client.c +++ b/networking/nbd-client.c | |||
@@ -163,7 +163,9 @@ int nbdclient_main(int argc, char **argv) | |||
163 | int sock, nbd; | 163 | int sock, nbd; |
164 | int ro; | 164 | int ro; |
165 | int proto_new; // 0 for old, 1 for new | 165 | int proto_new; // 0 for old, 1 for new |
166 | #if BB_MMU | ||
166 | char *data; | 167 | char *data; |
168 | #endif | ||
167 | 169 | ||
168 | // Make sure BLOCKDEV exists | 170 | // Make sure BLOCKDEV exists |
169 | nbd = xopen(device, O_RDWR); | 171 | nbd = xopen(device, O_RDWR); |
@@ -200,7 +202,9 @@ int nbdclient_main(int argc, char **argv) | |||
200 | ioctl(nbd, NBD_SET_SIZE_BLOCKS, size_blocks); | 202 | ioctl(nbd, NBD_SET_SIZE_BLOCKS, size_blocks); |
201 | ioctl(nbd, NBD_CLEAR_SOCK); | 203 | ioctl(nbd, NBD_CLEAR_SOCK); |
202 | ro = !!(old_nbd_header.flags & htons(2)); | 204 | ro = !!(old_nbd_header.flags & htons(2)); |
205 | #if BB_MMU | ||
203 | data = old_nbd_header.data; | 206 | data = old_nbd_header.data; |
207 | #endif | ||
204 | } else { | 208 | } else { |
205 | unsigned namelen; | 209 | unsigned namelen; |
206 | uint16_t handshake_flags; | 210 | uint16_t handshake_flags; |
@@ -230,7 +234,9 @@ int nbdclient_main(int argc, char **argv) | |||
230 | ioctl(nbd, NBD_SET_FLAGS, | 234 | ioctl(nbd, NBD_SET_FLAGS, |
231 | ntohs(new_nbd_header.transmission_flags)); | 235 | ntohs(new_nbd_header.transmission_flags)); |
232 | ro = !!(new_nbd_header.transmission_flags & htons(2)); | 236 | ro = !!(new_nbd_header.transmission_flags & htons(2)); |
237 | #if BB_MMU | ||
233 | data = new_nbd_header.data; | 238 | data = new_nbd_header.data; |
239 | #endif | ||
234 | } | 240 | } |
235 | 241 | ||
236 | if (ioctl(nbd, BLKROSET, &ro) < 0) { | 242 | if (ioctl(nbd, BLKROSET, &ro) < 0) { |
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c index 477856d11..0c55fa5e4 100644 --- a/networking/udhcp/dhcpd.c +++ b/networking/udhcp/dhcpd.c | |||
@@ -378,7 +378,7 @@ struct config_keyword { | |||
378 | #define OFS(field) offsetof(struct server_config_t, field) | 378 | #define OFS(field) offsetof(struct server_config_t, field) |
379 | 379 | ||
380 | static const struct config_keyword keywords[] = { | 380 | static const struct config_keyword keywords[] = { |
381 | /* keyword handler variable address default */ | 381 | /* keyword handler variable address default */ |
382 | {"start" , udhcp_str2nip , OFS(start_ip ), "192.168.0.20"}, | 382 | {"start" , udhcp_str2nip , OFS(start_ip ), "192.168.0.20"}, |
383 | {"end" , udhcp_str2nip , OFS(end_ip ), "192.168.0.254"}, | 383 | {"end" , udhcp_str2nip , OFS(end_ip ), "192.168.0.254"}, |
384 | {"interface" , read_str , OFS(interface ), "eth0"}, | 384 | {"interface" , read_str , OFS(interface ), "eth0"}, |