diff options
| author | Andreas Langer <an.langer@gmx.de> | 2010-11-22 00:55:50 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-29 11:09:10 -0800 |
| commit | 225f7b0b950d141819a8d9694141571b349e563d (patch) | |
| tree | ae77ea04c63496d8f41a11e3c583cb1a1976ab46 /drivers/staging/batman-adv/unicast.c | |
| parent | 9061109ab18352c73b5dda426043dbb6d5e2dae7 (diff) | |
| download | op-kernel-dev-225f7b0b950d141819a8d9694141571b349e563d.zip op-kernel-dev-225f7b0b950d141819a8d9694141571b349e563d.tar.gz | |
Staging: batman-adv: reassemble fragmented skb if mtu allows it
Signed-off-by: Andreas Langer <an.langer@gmx.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/batman-adv/unicast.c')
| -rw-r--r-- | drivers/staging/batman-adv/unicast.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/staging/batman-adv/unicast.c b/drivers/staging/batman-adv/unicast.c index 12afae6..e58e634 100644 --- a/drivers/staging/batman-adv/unicast.c +++ b/drivers/staging/batman-adv/unicast.c @@ -36,6 +36,9 @@ static struct sk_buff *frag_merge_packet(struct list_head *head, struct unicast_frag_packet *up = (struct unicast_frag_packet *)skb->data; struct sk_buff *tmp_skb; + struct unicast_packet *unicast_packet; + int hdr_len = sizeof(struct unicast_packet), + uni_diff = sizeof(struct unicast_frag_packet) - hdr_len; /* set skb to the first part and tmp_skb to the second part */ if (up->flags & UNI_FRAG_HEAD) { @@ -59,6 +62,11 @@ static struct sk_buff *frag_merge_packet(struct list_head *head, memcpy(skb_put(skb, tmp_skb->len), tmp_skb->data, tmp_skb->len); kfree_skb(tmp_skb); + + memmove(skb->data + uni_diff, skb->data, hdr_len); + unicast_packet = (struct unicast_packet *) skb_pull(skb, uni_diff); + unicast_packet->packet_type = BAT_UNICAST; + return skb; } |
