2016-03-07 19:07:31

by Alexander Aring

Subject: [PATCH bluetooth-next] 6lowpan: iphc: fix SAM/DAM bit comment

This patch fixes the comments for SAM/DAM value.

Signed-off-by: Alexander Aring <[email protected]>
---
net/6lowpan/iphc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/6lowpan/iphc.c b/net/6lowpan/iphc.c
index 7217251..99bb22a 100644
--- 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);
--
2.7.2

2016-03-07 20:06:40

by Marcel Holtmann

Subject: Re: [PATCH bluetooth-next] 6lowpan: iphc: fix SAM/DAM bit comment

Hi Alex,

> This patch fixes the comments for SAM/DAM value.
>
> Signed-off-by: Alexander Aring <[email protected]>
> ---
> net/6lowpan/iphc.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

patch has been applied to bluetooth-next tree.

Regards

Marcel