Hi,
On Wed, Oct 09, 2013 at 07:06:14PM +0200, Alexander Aring wrote:
> This patch fix the fragmentation on sending side according to rfc4944.
>
> Also add improvement to use the full payload of a PDU which calculate the
> nearest divided to 8 payload length for the fragmentation datagram
> offset attribute.
>
> Signed-off-by: Alexander Aring <alex.ar...@gmail.com>
> ---
> include/net/ieee802154_netdev.h | 2 ++
> net/ieee802154/6lowpan.c | 76
> +++++++++++++++++++++++++++--------------
> 2 files changed, 52 insertions(+), 26 deletions(-)
>
> diff --git a/include/net/ieee802154_netdev.h b/include/net/ieee802154_netdev.h
> index 8196d5d..f93296d 100644
> --- a/include/net/ieee802154_netdev.h
> +++ b/include/net/ieee802154_netdev.h
> @@ -39,6 +39,8 @@ struct ieee802154_mac_cb {
> struct ieee802154_addr da;
> u8 flags;
> u8 seq;
> + u16 dgram_size;
...
> + skb->hdr_len = hc06_ptr - head;
I remove this one. We don't need it.
>
> lowpan_raw_dump_table(__func__, "raw skb data dump", skb->data,
> skb->len);
> @@ -1074,80 +1084,93 @@ static int lowpan_set_address(struct net_device *dev,
> void *p)
>
> static int
> lowpan_fragment_xmit(struct sk_buff *skb, u8 *head,
> - int mlen, int plen, int offset, int type)
> + int plen, int offset, int type)
> {
> struct sk_buff *frag;
> - int hlen, ret;
> + int hlen;
>
> hlen = (type == LOWPAN_DISPATCH_FRAG1) ?
> LOWPAN_FRAG1_HEAD_SIZE : LOWPAN_FRAGN_HEAD_SIZE;
>
> lowpan_raw_dump_inline(__func__, "6lowpan fragment header", head, hlen);
>
> - frag = dev_alloc_skb(hlen + mlen + plen + IEEE802154_MFR_SIZE);
> + frag = netdev_alloc_skb(skb->dev, hlen + skb->mac_len
> + + plen + IEEE802154_MFR_SIZE);
> if (!frag)
> return -ENOMEM;
>
> frag->priority = skb->priority;
> - frag->dev = skb->dev;
>
> /* copy header, MFR and payload */
> - memcpy(skb_put(frag, mlen), skb->data, mlen);
> - memcpy(skb_put(frag, hlen), head, hlen);
> + skb_put(frag, skb->mac_len);
> + skb_copy_to_linear_data(frag, skb_mac_header(skb), skb->mac_len);
>
> - if (plen)
> - skb_copy_from_linear_data_offset(skb, offset + mlen,
> - skb_put(frag, plen), plen);
> + skb_put(frag, hlen);
> + skb_copy_to_linear_data_offset(frag, skb->mac_len, head, hlen);
>
> - lowpan_raw_dump_table(__func__, " raw fragment dump", frag->data,
> - frag->len);
> + skb_put(frag, plen);
> + skb_copy_to_linear_data_offset(frag, skb->mac_len + hlen,
> + skb_network_header(skb) + offset, plen);
>
> - ret = dev_queue_xmit(frag);
> + lowpan_raw_dump_table(__func__, " raw fragment dump",
> + frag->data, frag->len);
>
> - return ret;
> + return dev_queue_xmit(frag);
> }
>
> static int
> lowpan_skb_fragmentation(struct sk_buff *skb, struct net_device *dev)
> {
> - int err, header_length, payload_length, tag, offset = 0;
> + int err, payload_length, tag, dgram_size,
> + dgram_offset, lowpan_size, frag_plen, offset = 0;
> u8 head[5];
>
> - header_length = skb->mac_len;
> - payload_length = skb->len - header_length;
> + payload_length = skb->len - skb->mac_len;
> tag = lowpan_dev_info(dev)->fragment_tag++;
> + lowpan_size = skb->transport_header - skb->network_header;
Here we could use hdr_len. But this would also work.
- Alex
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134071&iu=/4140/ostg.clktrk
_______________________________________________
Linux-zigbee-devel mailing list
Linux-zigbee-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-zigbee-devel
