Merge tag 'sound-fix-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[deliverable/linux.git] / net / 6lowpan / iphc.c

diff --git a/net/6lowpan/iphc.c b/net/6lowpan/iphc.c
index 72172514fea063a34ed2e1314d1a996db6a38015..99bb22aea346d42b55b4fb1dbc7d7cf30bb7c9d8 100644 (file)
--- a/net/6lowpan/iphc.c
+++ b/net/6lowpan/iphc.c
@@ -788,7 +788,7 @@ static u8 lowpan_compress_ctx_addr(u8 **hc_ptr, const struct in6_addr *ipaddr,
        }
 
        memset(&tmp, 0, sizeof(tmp));
-       /* check for SAM/DAM = 01 */
+       /* check for SAM/DAM = 10 */
        tmp.s6_addr[11] = 0xFF;
        tmp.s6_addr[12] = 0xFE;
        memcpy(&tmp.s6_addr[14], &ipaddr->s6_addr[14], 2);
@@ -801,7 +801,7 @@ static u8 lowpan_compress_ctx_addr(u8 **hc_ptr, const struct in6_addr *ipaddr,
        }
 
        memset(&tmp, 0, sizeof(tmp));
-       /* check for SAM/DAM = 10, should always match */
+       /* check for SAM/DAM = 01, should always match */
        memcpy(&tmp.s6_addr[8], &ipaddr->s6_addr[8], 8);
        /* context information are always used */
        ipv6_addr_prefix_copy(&tmp, &ctx->pfx, ctx->plen);