Staging: batman-adv: Fix aggregation direct-link bug

So far, neighbour's secondary interface OGMs can involuntarily
piggyback on primary interface OGMs that arrived on the same secondary
interface before. Secondary interface OGMs should NEVER leave their
direct neighbour broadcast domain! This patch ensures that secondary
interface OGMs can only be aggregated to other secondary interface OGMs.

Signed-off-by: Linus Lüssing <linus.luessing@web.de>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/batman-adv/aggregation.c b/drivers/staging/batman-adv/aggregation.c
index d25e5a89dac3254cc6d76e90a8e30199095e8cd2..e1bd321854395a0b15d472cd1e9639b8282fb56b 100644 (file)
--- a/drivers/staging/batman-adv/aggregation.c
+++ b/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,