diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2022-12-15 11:49:00 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2022-12-15 11:49:00 +0100 |
commit | 301ef96892939498ceb0a70e1f523ba9a7a7b9c1 (patch) | |
tree | 8b0054b25ef45c16d7313f9e4d2259d560e83931 | |
parent | 3636d52cbebe81e306b3571183232f6e8be730d1 (diff) | |
download | busybox-w32-301ef96892939498ceb0a70e1f523ba9a7a7b9c1.tar.gz busybox-w32-301ef96892939498ceb0a70e1f523ba9a7a7b9c1.tar.bz2 busybox-w32-301ef96892939498ceb0a70e1f523ba9a7a7b9c1.zip |
udhcpc6: align FF02__1_2[]
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | networking/udhcp/common.h | 3 | ||||
-rw-r--r-- | networking/udhcp/d6_dhcpc.c | 2 | ||||
-rw-r--r-- | networking/udhcp/d6_packet.c | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h index 5882238e3..49a0b593d 100644 --- a/networking/udhcp/common.h +++ b/networking/udhcp/common.h | |||
@@ -370,7 +370,8 @@ void udhcp_sp_setup(void) FAST_FUNC; | |||
370 | void udhcp_sp_fd_set(struct pollfd *pfds, int extra_fd) FAST_FUNC; | 370 | void udhcp_sp_fd_set(struct pollfd *pfds, int extra_fd) FAST_FUNC; |
371 | int udhcp_sp_read(void) FAST_FUNC; | 371 | int udhcp_sp_read(void) FAST_FUNC; |
372 | 372 | ||
373 | int udhcp_read_interface(const char *interface, int *ifindex, uint32_t *nip, uint8_t *mac) FAST_FUNC; | 373 | int udhcp_read_interface(const char *interface, |
374 | int *ifindex, uint32_t *nip, uint8_t *mac) FAST_FUNC; | ||
374 | 375 | ||
375 | int udhcp_listen_socket(/*uint32_t ip,*/ int port, const char *inf) FAST_FUNC; | 376 | int udhcp_listen_socket(/*uint32_t ip,*/ int port, const char *inf) FAST_FUNC; |
376 | 377 | ||
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c index 9384e4b9c..e49d752e6 100644 --- a/networking/udhcp/d6_dhcpc.c +++ b/networking/udhcp/d6_dhcpc.c | |||
@@ -548,7 +548,7 @@ static uint8_t *add_d6_client_options(uint8_t *ptr) | |||
548 | static int d6_mcast_from_client_data_ifindex(struct d6_packet *packet, uint8_t *end) | 548 | static int d6_mcast_from_client_data_ifindex(struct d6_packet *packet, uint8_t *end) |
549 | { | 549 | { |
550 | /* FF02::1:2 is "All_DHCP_Relay_Agents_and_Servers" address */ | 550 | /* FF02::1:2 is "All_DHCP_Relay_Agents_and_Servers" address */ |
551 | static const uint8_t FF02__1_2[16] = { | 551 | static const uint8_t FF02__1_2[16] ALIGNED(sizeof(long)) = { |
552 | 0xFF, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 552 | 0xFF, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
553 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, | 553 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, |
554 | }; | 554 | }; |
diff --git a/networking/udhcp/d6_packet.c b/networking/udhcp/d6_packet.c index c1949f6e3..aab1a9182 100644 --- a/networking/udhcp/d6_packet.c +++ b/networking/udhcp/d6_packet.c | |||
@@ -27,9 +27,8 @@ void FAST_FUNC d6_dump_packet(struct d6_packet *packet) | |||
27 | } | 27 | } |
28 | #endif | 28 | #endif |
29 | 29 | ||
30 | int FAST_FUNC d6_recv_kernel_packet(struct in6_addr *peer_ipv6 | 30 | int FAST_FUNC d6_recv_kernel_packet(struct in6_addr *peer_ipv6 UNUSED_PARAM, |
31 | UNUSED_PARAM | 31 | struct d6_packet *packet, int fd) |
32 | , struct d6_packet *packet, int fd) | ||
33 | { | 32 | { |
34 | int bytes; | 33 | int bytes; |
35 | 34 | ||