summaryrefslogtreecommitdiffstats
path: root/net/ieee802154
diff options
context:
space:
mode:
authorTony Cheneau <tony.cheneau@amnesiak.org>2013-03-25 17:59:21 +0000
committerDavid S. Miller <davem@davemloft.net>2013-03-26 12:37:55 -0400
commit8d879a3f9856fe6c6e27853a96c0beaed03acb2c (patch)
tree68a9778444faf9aec2b8cc602893ce6bbd095fa8 /net/ieee802154
parentde179c8c12e9e5a292269fa59e7c26ca797dc7bf (diff)
downloadlinux-8d879a3f9856fe6c6e27853a96c0beaed03acb2c.tar.gz
linux-8d879a3f9856fe6c6e27853a96c0beaed03acb2c.tar.bz2
linux-8d879a3f9856fe6c6e27853a96c0beaed03acb2c.zip
6lowpan: lowpan_is_iid_16_bit_compressable() does not detect compressible address correctly
The current test is not RFC6282 compliant. The same issue has been found and fixed in Contiki. This patch is basically a port of their fix. Signed-off-by: Tony Cheneau <tony.cheneau@amnesiak.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ieee802154')
-rw-r--r--net/ieee802154/6lowpan.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ieee802154/6lowpan.h b/net/ieee802154/6lowpan.h
index bba5f8336317..4b8f917658b5 100644
--- a/net/ieee802154/6lowpan.h
+++ b/net/ieee802154/6lowpan.h
@@ -92,9 +92,10 @@
*/
#define lowpan_is_iid_16_bit_compressable(a) \
((((a)->s6_addr16[4]) == 0) && \
- (((a)->s6_addr16[5]) == 0) && \
- (((a)->s6_addr16[6]) == 0) && \
- ((((a)->s6_addr[14]) & 0x80) == 0))
+ (((a)->s6_addr[10]) == 0) && \
+ (((a)->s6_addr[11]) == 0xff) && \
+ (((a)->s6_addr[12]) == 0xfe) && \
+ (((a)->s6_addr[13]) == 0))
/* multicast address */
#define is_addr_mcast(a) (((a)->s6_addr[0]) == 0xFF)