From: Alexander Aring <alex.aring@gmail.com>
To: linux-wpan@vger.kernel.org
Cc: kernel@pengutronix.de, linux-bluetooth@vger.kernel.org,
jukka.rissanen@linux.intel.com,
Alexander Aring <alex.aring@gmail.com>
Subject: [PATCH bluetooth-next 3/6] 6lowpan: remove lowpan_is_addr_broadcast
Date: Tue, 20 Oct 2015 08:31:23 +0200 [thread overview]
Message-ID: <1445322686-2952-4-git-send-email-alex.aring@gmail.com> (raw)
In-Reply-To: <1445322686-2952-1-git-send-email-alex.aring@gmail.com>
This macro is used at 802.15.4 6LoWPAN only and can be replaced by
memcmp with the interface broadcast address.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
include/net/6lowpan.h | 10 ----------
net/ieee802154/6lowpan/tx.c | 2 +-
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/include/net/6lowpan.h b/include/net/6lowpan.h
index f127a92..cf3bc56 100644
--- a/include/net/6lowpan.h
+++ b/include/net/6lowpan.h
@@ -74,16 +74,6 @@
LOWPAN_IPHC_MAX_HEADER_LEN + \
LOWPAN_NHC_MAX_HDR_LEN)
-#define lowpan_is_addr_broadcast(a) \
- ((((a)[0]) == 0xFF) && \
- (((a)[1]) == 0xFF) && \
- (((a)[2]) == 0xFF) && \
- (((a)[3]) == 0xFF) && \
- (((a)[4]) == 0xFF) && \
- (((a)[5]) == 0xFF) && \
- (((a)[6]) == 0xFF) && \
- (((a)[7]) == 0xFF))
-
#define LOWPAN_DISPATCH_IPV6 0x41 /* 01000001 = 65 */
#define LOWPAN_DISPATCH_IPHC 0x60 /* 011xxxxx = ... */
#define LOWPAN_DISPATCH_IPHC_MASK 0xe0
diff --git a/net/ieee802154/6lowpan/tx.c b/net/ieee802154/6lowpan/tx.c
index f6594a8..d4353fa 100644
--- a/net/ieee802154/6lowpan/tx.c
+++ b/net/ieee802154/6lowpan/tx.c
@@ -238,7 +238,7 @@ static int lowpan_header(struct sk_buff *skb, struct net_device *ldev,
/* if the destination address is the broadcast address, use the
* corresponding short address
*/
- if (lowpan_is_addr_broadcast((const u8 *)daddr)) {
+ if (!memcmp(daddr, ldev->broadcast, EUI64_ADDR_LEN)) {
da.mode = IEEE802154_ADDR_SHORT;
da.short_addr = cpu_to_le16(IEEE802154_ADDR_BROADCAST);
cb->ackreq = false;
--
2.6.1
next prev parent reply other threads:[~2015-10-20 6:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-20 6:31 [PATCH bluetooth-next 0/6] 6lowpan: iphc defines and rework tc and flow label handling Alexander Aring
2015-10-20 6:31 ` [PATCH bluetooth-next 1/6] 6lowpan: nhc: move iphc manipulation out of nhc Alexander Aring
2015-10-20 6:31 ` [PATCH bluetooth-next 2/6] 6lowpan: move IPHC functionality defines Alexander Aring
2015-10-20 6:31 ` Alexander Aring [this message]
2015-10-20 6:31 ` [PATCH bluetooth-next 4/6] 6lowpan: iphc: change define values Alexander Aring
2015-10-20 6:31 ` [PATCH bluetooth-next 5/6] 6lowpan: rework tc and flow label handling Alexander Aring
2015-10-20 6:31 ` [PATCH bluetooth-next 6/6] 6lowpan: put mcast compression in an own function Alexander Aring
2015-10-20 8:06 ` [PATCH bluetooth-next 0/6] 6lowpan: iphc defines and rework tc and flow label handling Marcel Holtmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445322686-2952-4-git-send-email-alex.aring@gmail.com \
--to=alex.aring@gmail.com \
--cc=jukka.rissanen@linux.intel.com \
--cc=kernel@pengutronix.de \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-wpan@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).