Use more conventional way for the alignment

[oweals/odhcp6c.git] / src / ra.c

diff --git a/src/ra.c b/src/ra.c
index dd5962a29e750dba87bd39c33664e8e531efc7d5..f1b102d5abf671a1d6ce67f9a50f86a3b76fbdb5 100644 (file)
--- a/src/ra.c
+++ b/src/ra.c
@@ -275,7 +275,10 @@ bool ra_process(void)
        bool found = false;
        bool changed = false;
        uint8_t buf[1500] __aligned(4);
-       uint8_t cmsg_buf[128] __aligned(__alignof__(struct cmsghdr));
+       union {
+               struct cmsghdr hdr;
+               uint8_t buf[CMSG_SPACE(sizeof(int))];
+       } cmsg_buf;
        struct nd_router_advert *adv = (struct nd_router_advert*)buf;
        struct odhcp6c_entry *entry = alloca(sizeof(*entry) + 256);
        const struct in6_addr any = IN6ADDR_ANY_INIT;
@@ -302,7 +305,7 @@ bool ra_process(void)
                        .msg_namelen = sizeof(from),
                        .msg_iov = &iov,
                        .msg_iovlen = 1,
-                       .msg_control = cmsg_buf,
+                       .msg_control = cmsg_buf.buf,
                        .msg_controllen = sizeof(cmsg_buf),
                        .msg_flags = 0
                };