mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
batman-adv: Don't always reallocate the fragmentation skb head
commit992b03b88e
upstream. When a packet is fragmented by batman-adv, the original batman-adv header is not modified. Only a new fragmentation is inserted between the original one and the ethernet header. The code must therefore make sure that it has a writable region of this size in the skbuff head. But it is not useful to always reallocate the skbuff by this size even when there would be more than enough headroom still in the skb. The reallocation is just to costly during in this codepath. Fixes:ee75ed8887
("batman-adv: Fragment and send skbs larger than mtu") Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
08bceb1e30
commit
56a32c8276
1 changed files with 6 additions and 5 deletions
|
@ -527,13 +527,14 @@ int batadv_frag_send_packet(struct sk_buff *skb,
|
|||
frag_header.no++;
|
||||
}
|
||||
|
||||
/* Make room for the fragment header. */
|
||||
if (batadv_skb_head_push(skb, header_size) < 0 ||
|
||||
pskb_expand_head(skb, header_size + ETH_HLEN, 0, GFP_ATOMIC) < 0) {
|
||||
ret = -ENOMEM;
|
||||
/* make sure that there is at least enough head for the fragmentation
|
||||
* and ethernet headers
|
||||
*/
|
||||
ret = skb_cow_head(skb, ETH_HLEN + header_size);
|
||||
if (ret < 0)
|
||||
goto put_primary_if;
|
||||
}
|
||||
|
||||
skb_push(skb, header_size);
|
||||
memcpy(skb->data, &frag_header, header_size);
|
||||
|
||||
/* Send the last fragment */
|
||||
|
|
Loading…
Reference in a new issue