aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/routing.c
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-02-28 04:55:36 -0500
committerMarek Lindner <lindner_marek@yahoo.de>2012-02-28 06:14:31 -0500
commit7c64fd98ce512de6c6dae0452dc026446bd368d5 (patch)
tree81b5a3df9c7937f1d85cc9f32841fe9b949ca0bb /net/batman-adv/routing.c
parentfdc8ff101163f10d36187a890a3c4990cebb8b12 (diff)
batman-adv: Fix indentation of multiline statements
Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Diffstat (limited to 'net/batman-adv/routing.c')
-rw-r--r--net/batman-adv/routing.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index cf9a2f62de6a..f53515562a4f 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -72,7 +72,7 @@ static void _update_route(struct bat_priv *bat_priv,
72 bat_dbg(DBG_ROUTES, bat_priv, "Deleting route towards: %pM\n", 72 bat_dbg(DBG_ROUTES, bat_priv, "Deleting route towards: %pM\n",
73 orig_node->orig); 73 orig_node->orig);
74 tt_global_del_orig(bat_priv, orig_node, 74 tt_global_del_orig(bat_priv, orig_node,
75 "Deleted route towards originator"); 75 "Deleted route towards originator");
76 76
77 /* route added */ 77 /* route added */
78 } else if ((!curr_router) && (neigh_node)) { 78 } else if ((!curr_router) && (neigh_node)) {
@@ -229,8 +229,8 @@ void bonding_save_primary(const struct orig_node *orig_node,
229int window_protected(struct bat_priv *bat_priv, int32_t seq_num_diff, 229int window_protected(struct bat_priv *bat_priv, int32_t seq_num_diff,
230 unsigned long *last_reset) 230 unsigned long *last_reset)
231{ 231{
232 if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) 232 if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) ||
233 || (seq_num_diff >= EXPECTED_SEQNO_RANGE)) { 233 (seq_num_diff >= EXPECTED_SEQNO_RANGE)) {
234 if (has_timed_out(*last_reset, RESET_PROTECTION_MS)) { 234 if (has_timed_out(*last_reset, RESET_PROTECTION_MS)) {
235 235
236 *last_reset = jiffies; 236 *last_reset = jiffies;
@@ -429,7 +429,7 @@ int recv_icmp_packet(struct sk_buff *skb, struct hard_iface *recv_if)
429 if ((hdr_size == sizeof(struct icmp_packet_rr)) && 429 if ((hdr_size == sizeof(struct icmp_packet_rr)) &&
430 (icmp_packet->rr_cur < BAT_RR_LEN)) { 430 (icmp_packet->rr_cur < BAT_RR_LEN)) {
431 memcpy(&(icmp_packet->rr[icmp_packet->rr_cur]), 431 memcpy(&(icmp_packet->rr[icmp_packet->rr_cur]),
432 ethhdr->h_dest, ETH_ALEN); 432 ethhdr->h_dest, ETH_ALEN);
433 icmp_packet->rr_cur++; 433 icmp_packet->rr_cur++;
434 } 434 }
435 435