From: Alexander Aring <aar@pengutronix.de>
To: linux-wpan@vger.kernel.org
Cc: kernel@pengutronix.de, linux-bluetooth@vger.kernel.org,
Alexander Aring <aar@pengutronix.de>
Subject: [RFCv2 bluetooth-next 14/19] 6lowpan: iphc: override l2 packet information
Date: Sun, 7 Aug 2016 16:30:51 +0200 [thread overview]
Message-ID: <20160807143056.3116-15-aar@pengutronix.de> (raw)
In-Reply-To: <20160807143056.3116-1-aar@pengutronix.de>
The skb->pkt_type need to be set by L2, but on 6LoWPAN there exists L2
e.g. BTLE which doesn't has multicast addressing. If it's a multicast or
not is detected by IPHC headers multicast bit. The IPv6 layer will
evaluate this pkt_type, so we force set this type while uncompressing.
Should be okay for 802.15.4 as well.
Signed-off-by: Alexander Aring <aar@pengutronix.de>
---
net/6lowpan/iphc.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/net/6lowpan/iphc.c b/net/6lowpan/iphc.c
index 79f1fa2..fb5f6fa 100644
--- a/net/6lowpan/iphc.c
+++ b/net/6lowpan/iphc.c
@@ -666,6 +666,8 @@ int lowpan_header_decompress(struct sk_buff *skb, const struct net_device *dev,
switch (iphc1 & (LOWPAN_IPHC_M | LOWPAN_IPHC_DAC)) {
case LOWPAN_IPHC_M | LOWPAN_IPHC_DAC:
+ skb->pkt_type = PACKET_BROADCAST;
+
spin_lock_bh(&lowpan_dev(dev)->ctx.lock);
ci = lowpan_iphc_ctx_get_by_id(dev, LOWPAN_IPHC_CID_DCI(cid));
if (!ci) {
@@ -681,11 +683,15 @@ int lowpan_header_decompress(struct sk_buff *skb, const struct net_device *dev,
spin_unlock_bh(&lowpan_dev(dev)->ctx.lock);
break;
case LOWPAN_IPHC_M:
+ skb->pkt_type = PACKET_BROADCAST;
+
/* multicast */
err = lowpan_uncompress_multicast_daddr(skb, &hdr.daddr,
iphc1 & LOWPAN_IPHC_DAM_MASK);
break;
case LOWPAN_IPHC_DAC:
+ skb->pkt_type = PACKET_HOST;
+
spin_lock_bh(&lowpan_dev(dev)->ctx.lock);
ci = lowpan_iphc_ctx_get_by_id(dev, LOWPAN_IPHC_CID_DCI(cid));
if (!ci) {
@@ -701,6 +707,8 @@ int lowpan_header_decompress(struct sk_buff *skb, const struct net_device *dev,
spin_unlock_bh(&lowpan_dev(dev)->ctx.lock);
break;
default:
+ skb->pkt_type = PACKET_HOST;
+
err = lowpan_iphc_uncompress_addr(skb, dev, &hdr.daddr,
iphc1 & LOWPAN_IPHC_DAM_MASK,
daddr);
--
2.9.2
next prev parent reply other threads:[~2016-08-07 14:30 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-07 14:30 [RFCv2 bluetooth-next 00/19] bluetooth: rework 6lowpan implementation Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 01/19] ieee802154: 6lowpan: remove headroom check Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 02/19] ieee802154: 6lowpan: move skb cb BUILD_BUG_ON check Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 03/19] 6lowpan: remove LOWPAN_IPHC_MAX_HEADER_LEN Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 04/19] 6lowpan: hold netdev while unregister Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 05/19] 6lowpan: introduce generic default naming Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 06/19] 6lowpan: move rx defines to generic Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 07/19] bluetooth: introduce l2cap_hdev_chan_connect Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 08/19] bluetooth: add hci dev notifier Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 09/19] bluetooth: introduce l2cap chan priv data Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 10/19] bluetooth: export functions and variables Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 11/19] 6lowpan: bluetooth: remove implementation Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 12/19] ieee802154: 6lowpan: move header create to 6lowpan Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 13/19] 6lowpan: move dev_init to generic Alexander Aring
2016-08-07 14:30 ` Alexander Aring [this message]
2016-08-07 14:30 ` [RFCv2 bluetooth-next 15/19] ipv6: addrconf: fix 48 bit 6lowpan autoconfiguration Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 16/19] 6lowpan: iphc: add handling for btle Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 17/19] 6lowpan: move multicast flags to generic Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 18/19] 6lowpan: move addr_len setting away from generic Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 19/19] 6lowpan: bluetooth: add new implementation Alexander Aring
2016-08-08 12:10 ` [RFCv2 bluetooth-next 00/19] bluetooth: rework 6lowpan implementation Alexander Aring
2016-11-22 12:14 ` Luiz Augusto von Dentz
2016-11-22 15:41 ` Alexander Aring
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=20160807143056.3116-15-aar@pengutronix.de \
--to=aar@pengutronix.de \
--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).