From 57622fffb7e74065f4a7b32d37acd44299fe9759 Mon Sep 17 00:00:00 2001 From: Vladislav Grishenko Date: Sun, 31 Jan 2016 21:03:00 +0500 Subject: Use more conventional way for the alignment --- src/ra.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/ra.c') diff --git a/src/ra.c b/src/ra.c index dd5962a..f1b102d 100644 --- 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 }; -- cgit v1.2.1 From 7a3af454310e5cd8cded240aac4a1e2a7fd04569 Mon Sep 17 00:00:00 2001 From: Vladislav Grishenko Date: Sun, 31 Jan 2016 21:03:55 +0500 Subject: Sync style with the existing _packed & _unused macros --- src/ra.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ra.c') diff --git a/src/ra.c b/src/ra.c index f1b102d..89dc58b 100644 --- a/src/ra.c +++ b/src/ra.c @@ -274,7 +274,7 @@ bool ra_process(void) { bool found = false; bool changed = false; - uint8_t buf[1500] __aligned(4); + uint8_t buf[1500] _aligned(4); union { struct cmsghdr hdr; uint8_t buf[CMSG_SPACE(sizeof(int))]; -- cgit v1.2.1