Skip to content

Commit

Permalink
batman-adv: checkpatch - else is not generally useful after a break o…
Browse files Browse the repository at this point in the history
…r return

Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
  • Loading branch information
Antonio Quartulli committed Jan 7, 2015
1 parent a0e2877 commit 24820df
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 9 deletions.
3 changes: 1 addition & 2 deletions net/batman-adv/bitarray.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ static inline int batadv_test_bit(const unsigned long *seq_bits,
diff = last_seqno - curr_seqno;
if (diff < 0 || diff >= BATADV_TQ_LOCAL_WINDOW_SIZE)
return 0;
else
return test_bit(diff, seq_bits) != 0;
return test_bit(diff, seq_bits) != 0;
}

/* turn corresponding bit on, so we can remember that we got the packet */
Expand Down
3 changes: 1 addition & 2 deletions net/batman-adv/fragmentation.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ batadv_frag_check_entry(struct batadv_frag_table_entry *frags_entry)
if (!hlist_empty(&frags_entry->head) &&
batadv_has_timed_out(frags_entry->timestamp, BATADV_FRAG_TIMEOUT))
return true;
else
return false;
return false;
}

#endif /* _NET_BATMAN_ADV_FRAGMENTATION_H_ */
3 changes: 1 addition & 2 deletions net/batman-adv/network-coding.c
Original file line number Diff line number Diff line change
Expand Up @@ -1212,8 +1212,7 @@ static bool batadv_nc_skb_coding_possible(struct sk_buff *skb,
{
if (BATADV_SKB_CB(skb)->decoded && !batadv_compare_eth(dst, src))
return false;
else
return true;
return true;
}

/**
Expand Down
5 changes: 2 additions & 3 deletions net/batman-adv/translation-table.c
Original file line number Diff line number Diff line change
Expand Up @@ -2769,9 +2769,8 @@ static bool batadv_send_tt_response(struct batadv_priv *bat_priv,
{
if (batadv_is_my_mac(bat_priv, req_dst))
return batadv_send_my_tt_response(bat_priv, tt_data, req_src);
else
return batadv_send_other_tt_response(bat_priv, tt_data,
req_src, req_dst);
return batadv_send_other_tt_response(bat_priv, tt_data, req_src,
req_dst);
}

static void _batadv_tt_update_changes(struct batadv_priv *bat_priv,
Expand Down

0 comments on commit 24820df

Please sign in to comment.