batman-adv: iv_ogm_can_aggregate, code readability

This patch tries to increase code readability by negating the first if
block and rearranging some of the other conditional blocks. This way we
save an indentation level, we also save some allocation that is not
necessary for one of the conditions.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index f9c5610949425fed6c9d2acc0c328dfb9b34a781..ce04cd75fae49f765307b15984fd033107945200 100644 (file)
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -544,58 +544,62 @@ batadv_iv_ogm_can_aggregate(const struct batadv_ogm_packet *new_bat_ogm_packet,
         * - the send time is within our MAX_AGGREGATION_MS time
         * - the resulting packet wont be bigger than
         *   MAX_AGGREGATION_BYTES
+        * otherwise aggregation is not possible
         */
-       if (time_before(send_time, forw_packet->send_time) &&
-           time_after_eq(aggregation_end_time, forw_packet->send_time) &&
-           (aggregated_bytes <= BATADV_MAX_AGGREGATION_BYTES)) {
-               /* check aggregation compatibility
-                * -> direct link packets are broadcasted on
-                *    their interface only
-                * -> aggregate packet if the current packet is
-                *    a "global" packet as well as the base
-                *    packet
-                */
-               primary_if = batadv_primary_if_get_selected(bat_priv);
-               if (!primary_if)
-                       goto out;
-
-               /* packet is not leaving on the same interface. */
-               if (forw_packet->if_outgoing != if_outgoing)
-                       goto out;
+       if (!time_before(send_time, forw_packet->send_time) ||
+           !time_after_eq(aggregation_end_time, forw_packet->send_time))
+               return false;
+
+       if (aggregated_bytes > BATADV_MAX_AGGREGATION_BYTES)
+               return false;
+
+       /* packet is not leaving on the same interface. */
+       if (forw_packet->if_outgoing != if_outgoing)
+               return false;
+
+       /* check aggregation compatibility
+        * -> direct link packets are broadcasted on
+        *    their interface only
+        * -> aggregate packet if the current packet is
+        *    a "global" packet as well as the base
+        *    packet
+        */
+       primary_if = batadv_primary_if_get_selected(bat_priv);
+       if (!primary_if)
+               return false;
 
-               /* packets without direct link flag and high TTL
-                * are flooded through the net
-                */
-               if ((!directlink) &&
-                   (!(batadv_ogm_packet->flags & BATADV_DIRECTLINK)) &&
-                   (batadv_ogm_packet->ttl != 1) &&
-
-                   /* own packets originating non-primary
-                    * interfaces leave only that interface
-                    */
-                   ((!forw_packet->own) ||
-                    (forw_packet->if_incoming == primary_if))) {
-                       res = true;
-                       goto out;
-               }
+       /* packets without direct link flag and high TTL
+        * are flooded through the net
+        */
+       if (!directlink &&
+           !(batadv_ogm_packet->flags & BATADV_DIRECTLINK) &&
+           batadv_ogm_packet->ttl != 1 &&
+
+           /* own packets originating non-primary
+            * interfaces leave only that interface
+            */
+           (!forw_packet->own ||
+            forw_packet->if_incoming == primary_if)) {
+               res = true;
+               goto out;
+       }
 
-               /* if the incoming packet is sent via this one
-                * interface only - we still can aggregate
-                */
-               if ((directlink) &&
-                   (new_bat_ogm_packet->ttl == 1) &&
-                   (forw_packet->if_incoming == if_incoming) &&
-
-                   /* packets from direct neighbors or
-                    * own secondary interface packets
-                    * (= secondary interface packets in general)
-                    */
-                   (batadv_ogm_packet->flags & BATADV_DIRECTLINK ||
-                    (forw_packet->own &&
-                     forw_packet->if_incoming != primary_if))) {
-                       res = true;
-                       goto out;
-               }
+       /* if the incoming packet is sent via this one
+        * interface only - we still can aggregate
+        */
+       if (directlink &&
+           new_bat_ogm_packet->ttl == 1 &&
+           forw_packet->if_incoming == if_incoming &&
+
+           /* packets from direct neighbors or
+            * own secondary interface packets
+            * (= secondary interface packets in general)
+            */
+           (batadv_ogm_packet->flags & BATADV_DIRECTLINK ||
+            (forw_packet->own &&
+             forw_packet->if_incoming != primary_if))) {
+               res = true;
+               goto out;
        }
 
 out: