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-3d27d435dbe7d39894257894b9dd32bfa607604c.tar.gz | |
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) int sock, nbd; int ro; int proto_new; // 0 for old, 1 for new +#if BB_MMU char *data; +#endif // Make sure BLOCKDEV exists nbd = xopen(device, O_RDWR); @@ -200,7 +202,9 @@ int nbdclient_main(int argc, char **argv) ioctl(nbd, NBD_SET_SIZE_BLOCKS, size_blocks); ioctl(nbd, NBD_CLEAR_SOCK); ro = !!(old_nbd_header.flags & htons(2)); +#if BB_MMU data = old_nbd_header.data; +#endif } else { unsigned namelen; uint16_t handshake_flags; @@ -230,7 +234,9 @@ int nbdclient_main(int argc, char **argv) ioctl(nbd, NBD_SET_FLAGS, ntohs(new_nbd_header.transmission_flags)); ro = !!(new_nbd_header.transmission_flags & htons(2)); +#if BB_MMU data = new_nbd_header.data; +#endif } 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 { #define OFS(field) offsetof(struct server_config_t, field) static const struct config_keyword keywords[] = { - /* keyword handler variable address default */ + /* keyword handler variable address default */ {"start" , udhcp_str2nip , OFS(start_ip ), "192.168.0.20"}, {"end" , udhcp_str2nip , OFS(end_ip ), "192.168.0.254"}, {"interface" , read_str , OFS(interface ), "eth0"}, |