ieee802154: 6lowpan: fix intra pan id check

The RIOT-OS stack does send intra-pan frames but don't set the intra pan
flag inside the mac header. It seems this is valid frame addressing but
inefficient. Anyway this patch adds a new function for intra pan
addressing, doesn't matter if intra pan flag or source and destination
are the same. The newly introduction function will be used to check on
intra pan addressing for 6lowpan.

Signed-off-by: Alexander Aring <aar@pengutronix.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/include/net/mac802154.h b/include/net/mac802154.h
index ec01b35bc969e46c0fea311e8857884907175ab8..d757edd0b0b70b7f2e39aea9b4471fd05bf6c3c4 100644 (file)
--- a/include/net/mac802154.h
+++ b/include/net/mac802154.h
@@ -345,6 +345,25 @@ static inline unsigned char *ieee802154_skb_src_pan(__le16 fc,
        return src_pan;
 }
 
+/**
+ * ieee802154_skb_is_intra_pan_addressing - checks whenever the mac addressing
+ *     is an intra pan communication
+ * @fc: mac header frame control field
+ * @skb: skb where the source and destination pan should be get from
+ */
+static inline bool ieee802154_skb_is_intra_pan_addressing(__le16 fc,
+                                                         const struct sk_buff *skb)
+{
+       unsigned char *dst_pan = ieee802154_skb_dst_pan(fc, skb),
+                     *src_pan = ieee802154_skb_src_pan(fc, skb);
+
+       /* if one is NULL is no intra pan addressing */
+       if (!dst_pan || !src_pan)
+               return false;
+
+       return !memcmp(dst_pan, src_pan, IEEE802154_PAN_ID_LEN);
+}
+
 /**
  * ieee802154_be64_to_le64 - copies and convert be64 to le64
  * @le64_dst: le64 destination pointer

diff --git a/net/ieee802154/6lowpan/rx.c b/net/ieee802154/6lowpan/rx.c
index ef185dd4110d74e44139e96dd6fdeec26aafb5fd..649e7d45e88fae2430bff9a2baf7005fe3fba938 100644 (file)
--- a/net/ieee802154/6lowpan/rx.c
+++ b/net/ieee802154/6lowpan/rx.c
@@ -262,7 +262,7 @@ static inline bool lowpan_rx_h_check(struct sk_buff *skb)
 
        /* check on ieee802154 conform 6LoWPAN header */
        if (!ieee802154_is_data(fc) ||
-           !ieee802154_is_intra_pan(fc))
+           !ieee802154_skb_is_intra_pan_addressing(fc, skb))
                return false;
 
        /* check if we can dereference the dispatch */