diff options
| author | Alexander Aring <alex.aring@gmail.com> | 2015-09-02 14:21:25 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2015-09-17 13:20:03 +0200 |
| commit | 72a5e6bb5120d6464c9e7855c5a22555ede819dc (patch) | |
| tree | 14be5cd534bf3e6d7043cfd2f9d08c24b7028419 /net/6lowpan/iphc.c | |
| parent | f801cf40243d8f81ac05aa7466d9d8b1e676ee7c (diff) | |
| download | linux-stable-72a5e6bb5120d6464c9e7855c5a22555ede819dc.tar.gz linux-stable-72a5e6bb5120d6464c9e7855c5a22555ede819dc.tar.bz2 linux-stable-72a5e6bb5120d6464c9e7855c5a22555ede819dc.zip | |
ieee820154: 6lowpan: dispatch evaluation rework
This patch complete reworks the evaluation of 6lowpan dispatch value by
introducing a receive handler mechanism for each dispatch value.
A list of changes:
- Doing uncompression on-the-fly when FRAG1 is received, this require
some special handling for 802.15.4 lltype in generic 6lowpan branch
for setting the payload length correct.
- Fix dispatch mask for fragmentation.
- Add IPv6 dispatch evaluation for FRAG1.
- Add skb_unshare for dispatch which might manipulate the skb data
buffer.
Cc: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Reviewed-by: Stefan Schmidt <stefan@osg.samsung.com>
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/6lowpan/iphc.c')
| -rw-r--r-- | net/6lowpan/iphc.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/net/6lowpan/iphc.c b/net/6lowpan/iphc.c index 1e0071fdcf72..78c8a495b571 100644 --- a/net/6lowpan/iphc.c +++ b/net/6lowpan/iphc.c @@ -366,7 +366,18 @@ lowpan_header_decompress(struct sk_buff *skb, struct net_device *dev, return err; } - hdr.payload_len = htons(skb->len); + switch (lowpan_priv(dev)->lltype) { + case LOWPAN_LLTYPE_IEEE802154: + if (lowpan_802154_cb(skb)->d_size) + hdr.payload_len = htons(lowpan_802154_cb(skb)->d_size - + sizeof(struct ipv6hdr)); + else + hdr.payload_len = htons(skb->len); + break; + default: + hdr.payload_len = htons(skb->len); + break; + } pr_debug("skb headroom size = %d, data length = %d\n", skb_headroom(skb), skb->len); |