From 5c9c5ba52dd3535fafff5ff7f4e25ce801ab7b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20L=C3=BCssing?= Date: Fri, 7 May 2010 21:47:09 +0200 Subject: [PATCH] --- yaml --- r: 197351 b: refs/heads/master c: bdc0c7ebf770e21d024c2e94c3d578392b59c5b1 h: refs/heads/master i: 197349: fb77c513531ba6ac7072d228e43a726d1334ef55 197347: 318b0922ac43b891546377087bb9f6d1525912ce 197343: 5939e82f14e70b1c397318b274fcbf449c4f0f86 v: v3 --- [refs] | 2 +- trunk/drivers/staging/batman-adv/aggregation.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1ebe37c49b27..d70196f7f4ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd13b616aa9d082dce760759b7473da5ed399452 +refs/heads/master: bdc0c7ebf770e21d024c2e94c3d578392b59c5b1 diff --git a/trunk/drivers/staging/batman-adv/aggregation.c b/trunk/drivers/staging/batman-adv/aggregation.c index d25e5a89dac3..e1bd32185439 100644 --- a/trunk/drivers/staging/batman-adv/aggregation.c +++ b/trunk/drivers/staging/batman-adv/aggregation.c @@ -81,9 +81,15 @@ static bool can_aggregate_with(struct batman_packet *new_batman_packet, * interface only - we still can aggregate */ if ((directlink) && (new_batman_packet->ttl == 1) && - (forw_packet->if_incoming == if_incoming)) + (forw_packet->if_incoming == if_incoming) && + + /* packets from direct neighbors or + * own secondary interface packets + * (= secondary interface packets in general) */ + (batman_packet->flags & DIRECTLINK || + (forw_packet->own && + forw_packet->if_incoming->if_num != 0))) return true; - } return false; @@ -204,7 +210,7 @@ void add_bat_packet_to_list(unsigned char *packet_buff, int packet_len, * later on */ if ((!own_packet) && - (atomic_read(&bat_priv->aggregation_enabled))) + (atomic_read(&aggregation_enabled))) send_time += msecs_to_jiffies(MAX_AGGREGATION_MS); new_aggregated_packet(packet_buff, packet_len,