[git commit] udhcpc6: align FF02__1_2[]
Denys Vlasenko
vda.linux at googlemail.com
Thu Dec 15 10:49:00 UTC 2022
commit: https://git.busybox.net/busybox/commit/?id=301ef96892939498ceb0a70e1f523ba9a7a7b9c1
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
networking/udhcp/common.h | 3 ++-
networking/udhcp/d6_dhcpc.c | 2 +-
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;
void udhcp_sp_fd_set(struct pollfd *pfds, int extra_fd) FAST_FUNC;
int udhcp_sp_read(void) FAST_FUNC;
-int udhcp_read_interface(const char *interface, int *ifindex, uint32_t *nip, uint8_t *mac) FAST_FUNC;
+int udhcp_read_interface(const char *interface,
+ int *ifindex, uint32_t *nip, uint8_t *mac) FAST_FUNC;
int udhcp_listen_socket(/*uint32_t ip,*/ int port, const char *inf) FAST_FUNC;
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)
static int d6_mcast_from_client_data_ifindex(struct d6_packet *packet, uint8_t *end)
{
/* FF02::1:2 is "All_DHCP_Relay_Agents_and_Servers" address */
- static const uint8_t FF02__1_2[16] = {
+ static const uint8_t FF02__1_2[16] ALIGNED(sizeof(long)) = {
0xFF, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02,
};
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)
}
#endif
-int FAST_FUNC d6_recv_kernel_packet(struct in6_addr *peer_ipv6
- UNUSED_PARAM
- , struct d6_packet *packet, int fd)
+int FAST_FUNC d6_recv_kernel_packet(struct in6_addr *peer_ipv6 UNUSED_PARAM,
+ struct d6_packet *packet, int fd)
{
int bytes;
More information about the busybox-cvs
mailing list