Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 225f7b0b authored by Andreas Langer's avatar Andreas Langer Committed by Greg Kroah-Hartman
Browse files

Staging: batman-adv: reassemble fragmented skb if mtu allows it

parent 9061109a
Loading
Loading
Loading
Loading
+20 −1
Original line number Diff line number Diff line
@@ -1128,6 +1128,8 @@ static int route_unicast_packet(struct sk_buff *skb,
	unsigned long flags;
	struct unicast_packet *unicast_packet;
	struct ethhdr *ethhdr = (struct ethhdr *)skb_mac_header(skb);
	int ret;
	struct sk_buff *new_skb;

	unicast_packet = (struct unicast_packet *)skb->data;

@@ -1171,6 +1173,22 @@ static int route_unicast_packet(struct sk_buff *skb,
		return frag_send_skb(skb, bat_priv, batman_if,
				     dstaddr);

	if (unicast_packet->packet_type == BAT_UNICAST_FRAG &&
	    2 * skb->len - hdr_size <= batman_if->net_dev->mtu) {

		ret = frag_reassemble_skb(skb, bat_priv, &new_skb);

		if (ret == NET_RX_DROP)
			return NET_RX_DROP;

		/* packet was buffered for late merge */
		if (!new_skb)
			return NET_RX_SUCCESS;

		skb = new_skb;
		unicast_packet = (struct unicast_packet *) skb->data;
	}

	/* decrement ttl */
	unicast_packet->ttl--;

@@ -1224,7 +1242,8 @@ int recv_ucast_frag_packet(struct sk_buff *skb, struct batman_if *recv_if)
		if (!new_skb)
			return NET_RX_SUCCESS;

		interface_rx(recv_if->soft_iface, new_skb, hdr_size);
		interface_rx(recv_if->soft_iface, new_skb,
			     sizeof(struct unicast_packet));
		return NET_RX_SUCCESS;
	}

+8 −0
Original line number Diff line number Diff line
@@ -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;
}