fixeria submitted this change.

View Change


Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, approved
lib/icmpv6.h: fix struct icmpv6_{radv_hdr,opt_prefix}

Fix wrong field order in the big-endian variants.

Change-Id: Ifaa63bb5496e056805bd13b964c8b430fb11c24c
---
M lib/icmpv6.h
1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/lib/icmpv6.h b/lib/icmpv6.h
index 4b4dc37..ee5ef29 100644
--- a/lib/icmpv6.h
+++ b/lib/icmpv6.h
@@ -44,10 +44,9 @@
uint8_t res:6,
m:1,
o:1;
-#else
- uint8_t m:1,
- o:1,
- res:6;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
+ uint8_t o:1, m:1, res:6;
#endif
uint16_t router_lifetime;
uint32_t reachable_time;
@@ -72,10 +71,9 @@
uint8_t res:6,
a:1,
l:1;
-#else
- uint8_t l:1,
- a:1,
- res:6;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
+ uint8_t l:1, a:1, res:6;
#endif
uint32_t valid_lifetime;
uint32_t preferred_lifetime;

To view, visit change 31532. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: Ifaa63bb5496e056805bd13b964c8b430fb11c24c
Gerrit-Change-Number: 31532
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged