From 9ddce0b324aaa4d08dbc108585baa79c4ebe9ffb Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 16 Apr 2018 08:02:42 -0600 Subject: [PATCH] net/sixlowpan: Grrr.. got conditional logic reversed in the last commit --- net/sixlowpan/sixlowpan_hc06.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/sixlowpan/sixlowpan_hc06.c b/net/sixlowpan/sixlowpan_hc06.c index 39f0bd72d2..9ad7bfbc8b 100644 --- a/net/sixlowpan/sixlowpan_hc06.c +++ b/net/sixlowpan/sixlowpan_hc06.c @@ -490,9 +490,9 @@ static void uncompress_addr(FAR const struct netdev_varaddr_s *addr, for (i = destndx; i < endndx; i++) { #ifndef CONFIG_BIG_ENDIAN - if (usemac) + if (!usemac) { - /* Local address is already network order. Retain host order */ + /* Local address is in network order. Switch to host order */ ipaddr[i] = (uint16_t)srcptr[0] << 8 | (uint16_t)srcptr[1]; } @@ -517,7 +517,7 @@ static void uncompress_addr(FAR const struct netdev_varaddr_s *addr, if (fullmac) { - ipaddr[7] ^= 0x0200; + ipaddr[7] ^= usemac ? HTONS(0x0200) :0x0200; } /* If we took the data from packet, then update the packet pointer */