Commit 7c64fd98 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Marek Lindner

batman-adv: Fix indentation of multiline statements

Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
parent fdc8ff10
...@@ -154,8 +154,8 @@ int bit_get_packet(void *priv, unsigned long *seq_bits, ...@@ -154,8 +154,8 @@ int bit_get_packet(void *priv, unsigned long *seq_bits,
/* sequence number is much newer, probably missed a lot of packets */ /* sequence number is much newer, probably missed a lot of packets */
if ((seq_num_diff >= TQ_LOCAL_WINDOW_SIZE) if ((seq_num_diff >= TQ_LOCAL_WINDOW_SIZE) &&
&& (seq_num_diff < EXPECTED_SEQNO_RANGE)) { (seq_num_diff < EXPECTED_SEQNO_RANGE)) {
bat_dbg(DBG_BATMAN, bat_priv, bat_dbg(DBG_BATMAN, bat_priv,
"We missed a lot of packets (%i) !\n", "We missed a lot of packets (%i) !\n",
seq_num_diff - 1); seq_num_diff - 1);
...@@ -170,8 +170,8 @@ int bit_get_packet(void *priv, unsigned long *seq_bits, ...@@ -170,8 +170,8 @@ int bit_get_packet(void *priv, unsigned long *seq_bits,
* packet should be dropped without calling this function if the * packet should be dropped without calling this function if the
* seqno window is protected. */ * seqno window is protected. */
if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) ||
|| (seq_num_diff >= EXPECTED_SEQNO_RANGE)) { (seq_num_diff >= EXPECTED_SEQNO_RANGE)) {
bat_dbg(DBG_BATMAN, bat_priv, bat_dbg(DBG_BATMAN, bat_priv,
"Other host probably restarted!\n"); "Other host probably restarted!\n");
......
...@@ -353,9 +353,9 @@ int hardif_enable_interface(struct hard_iface *hard_iface, ...@@ -353,9 +353,9 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
ETH_DATA_LEN + BAT_HEADER_LEN) ETH_DATA_LEN + BAT_HEADER_LEN)
bat_info(hard_iface->soft_iface, bat_info(hard_iface->soft_iface,
"The MTU of interface %s is too small (%i) to handle " "The MTU of interface %s is too small (%i) to handle "
"the transport of batman-adv packets. If you experience" "the transport of batman-adv packets. If you "
" problems getting traffic through try increasing the " "experience problems getting traffic through try "
"MTU to %zi.\n", "increasing the MTU to %zi.\n",
hard_iface->net_dev->name, hard_iface->net_dev->mtu, hard_iface->net_dev->name, hard_iface->net_dev->mtu,
ETH_DATA_LEN + BAT_HEADER_LEN); ETH_DATA_LEN + BAT_HEADER_LEN);
...@@ -580,8 +580,8 @@ static int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, ...@@ -580,8 +580,8 @@ static int batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
goto err_free; goto err_free;
/* expect a valid ethernet header here. */ /* expect a valid ethernet header here. */
if (unlikely(skb->mac_len != sizeof(struct ethhdr) if (unlikely(skb->mac_len != sizeof(struct ethhdr) ||
|| !skb_mac_header(skb))) !skb_mac_header(skb)))
goto err_free; goto err_free;
if (!hard_iface->soft_iface) if (!hard_iface->soft_iface)
......
...@@ -333,10 +333,9 @@ static bool purge_orig_node(struct bat_priv *bat_priv, ...@@ -333,10 +333,9 @@ static bool purge_orig_node(struct bat_priv *bat_priv,
return true; return true;
} else { } else {
if (purge_orig_neighbors(bat_priv, orig_node, if (purge_orig_neighbors(bat_priv, orig_node,
&best_neigh_node)) { &best_neigh_node))
update_route(bat_priv, orig_node, best_neigh_node); update_route(bat_priv, orig_node, best_neigh_node);
} }
}
return false; return false;
} }
......
...@@ -229,8 +229,8 @@ void bonding_save_primary(const struct orig_node *orig_node, ...@@ -229,8 +229,8 @@ void bonding_save_primary(const struct orig_node *orig_node,
int window_protected(struct bat_priv *bat_priv, int32_t seq_num_diff, int window_protected(struct bat_priv *bat_priv, int32_t seq_num_diff,
unsigned long *last_reset) unsigned long *last_reset)
{ {
if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) ||
|| (seq_num_diff >= EXPECTED_SEQNO_RANGE)) { (seq_num_diff >= EXPECTED_SEQNO_RANGE)) {
if (has_timed_out(*last_reset, RESET_PROTECTION_MS)) { if (has_timed_out(*last_reset, RESET_PROTECTION_MS)) {
*last_reset = jiffies; *last_reset = jiffies;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment