Author: marek Date: 2010-05-03 00:45:33 +0200 (Mon, 03 May 2010) New Revision: 1648

Modified: trunk/batman-adv-kernelland/originator.c trunk/batman-adv-kernelland/routing.c trunk/batman-adv-kernelland/send.c Log: batman-adv: Synchronize formating with maint

Some changes in "batman-adv: Reduce max characters on a line to 80" for trunk and maint branch were made slightly different and should be synchronized for easier tracking of changes between them.

Signed-off-by: Sven Eckelmann sven.eckelmann@gmx.de

Modified: trunk/batman-adv-kernelland/originator.c =================================================================== --- trunk/batman-adv-kernelland/originator.c 2010-05-02 22:45:28 UTC (rev 1647) +++ trunk/batman-adv-kernelland/originator.c 2010-05-02 22:45:33 UTC (rev 1648) @@ -250,6 +250,7 @@ update_bonding_candidates(bat_priv, orig_node); } } + return false; }

@@ -310,7 +311,7 @@ "BATMAN mesh %s " "disabled - primary interface not active\n", net_dev->name); - else if (bat_priv->primary_if->if_status) + else if (bat_priv->primary_if->if_status != IF_ACTIVE) return 0;

rcu_read_lock();

Modified: trunk/batman-adv-kernelland/routing.c =================================================================== --- trunk/batman-adv-kernelland/routing.c 2010-05-02 22:45:28 UTC (rev 1647) +++ trunk/batman-adv-kernelland/routing.c 2010-05-02 22:45:33 UTC (rev 1648) @@ -641,8 +641,8 @@

if (is_my_oldorig) { bat_dbg(DBG_BATMAN, - "Drop packet: ignoring all rebroadcast echos " - "(sender: %pM)\n", ethhdr->h_source); + "Drop packet: ignoring all rebroadcast echos (sender: " + "%pM)\n", ethhdr->h_source); return; }

Modified: trunk/batman-adv-kernelland/send.c =================================================================== --- trunk/batman-adv-kernelland/send.c 2010-05-02 22:45:28 UTC (rev 1647) +++ trunk/batman-adv-kernelland/send.c 2010-05-02 22:45:33 UTC (rev 1648) @@ -152,11 +152,9 @@ "Sending own" : "Forwarding")); bat_dbg(DBG_BATMAN, - "%s %spacket " - "(originator %pM, seqno %d, TQ %d, TTL %d, IDF %s) " - "on interface %s [%s]\n", - fwd_str, - (packet_num > 0 ? "aggregated " : ""), + "%s %spacket (originator %pM, seqno %d, TQ %d, TTL %d," + " IDF %s) on interface %s [%s]\n", + fwd_str, (packet_num > 0 ? "aggregated " : ""), batman_packet->orig, ntohl(batman_packet->seqno), batman_packet->tq, batman_packet->ttl, (batman_packet->flags & DIRECTLINK ?