From d4d3c82a209ca699170f7f5d451f600319fa203a Mon Sep 17 00:00:00 2001 From: Marek Lindner Date: Tue, 19 Oct 2010 11:59:14 +0200 Subject: [PATCH] --- yaml --- r: 220382 b: refs/heads/master c: 15f00687e3b7b88c23d498d2c65e5911d8efa214 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/batman-adv/aggregation.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e0d0fd2d34d5..076e7822c194 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24fb009bae18f2ef712800ee9b2f52c177d9d3f9 +refs/heads/master: 15f00687e3b7b88c23d498d2c65e5911d8efa214 diff --git a/trunk/drivers/staging/batman-adv/aggregation.c b/trunk/drivers/staging/batman-adv/aggregation.c index 46b9c2b89ddb..16b268ea7aef 100644 --- a/trunk/drivers/staging/batman-adv/aggregation.c +++ b/trunk/drivers/staging/batman-adv/aggregation.c @@ -123,8 +123,14 @@ static void new_aggregated_packet(unsigned char *packet_buff, int packet_len, return; } - forw_packet_aggr->skb = dev_alloc_skb(MAX_AGGREGATION_BYTES + - sizeof(struct ethhdr)); + if ((atomic_read(&bat_priv->aggregation_enabled)) && + (packet_len < MAX_AGGREGATION_BYTES)) + forw_packet_aggr->skb = dev_alloc_skb(MAX_AGGREGATION_BYTES + + sizeof(struct ethhdr)); + else + forw_packet_aggr->skb = dev_alloc_skb(packet_len + + sizeof(struct ethhdr)); + if (!forw_packet_aggr->skb) { if (!own_packet) atomic_inc(&bat_priv->batman_queue_left);