diff options
author | Antonio Quartulli <ordex@autistici.org> | 2012-11-30 20:32:01 -0500 |
---|---|---|
committer | Antonio Quartulli <ordex@autistici.org> | 2013-01-12 05:58:21 -0500 |
commit | 46d160ef887963f26fee2df3d3b99eab54637014 (patch) | |
tree | 994220f470e1b0f5c48fd4f6308c778f548ba5ba /net | |
parent | dec05074b1a322f5fbbe3f81bc438a75bfec3c34 (diff) |
batman-adv: remove useless blank lines before and after brackets
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Diffstat (limited to 'net')
-rw-r--r-- | net/batman-adv/bat_iv_ogm.c | 6 | ||||
-rw-r--r-- | net/batman-adv/bridge_loop_avoidance.c | 4 | ||||
-rw-r--r-- | net/batman-adv/debugfs.c | 1 | ||||
-rw-r--r-- | net/batman-adv/originator.c | 3 | ||||
-rw-r--r-- | net/batman-adv/routing.c | 4 | ||||
-rw-r--r-- | net/batman-adv/send.c | 2 | ||||
-rw-r--r-- | net/batman-adv/translation-table.c | 7 | ||||
-rw-r--r-- | net/batman-adv/unicast.c | 2 |
8 files changed, 0 insertions, 29 deletions
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index f2a364970f57..d90e925d152a 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c | |||
@@ -183,7 +183,6 @@ static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet, | |||
183 | /* adjust all flags and log packets */ | 183 | /* adjust all flags and log packets */ |
184 | while (batadv_iv_ogm_aggr_packet(buff_pos, forw_packet->packet_len, | 184 | while (batadv_iv_ogm_aggr_packet(buff_pos, forw_packet->packet_len, |
185 | batadv_ogm_packet->tt_num_changes)) { | 185 | batadv_ogm_packet->tt_num_changes)) { |
186 | |||
187 | /* we might have aggregated direct link packets with an | 186 | /* we might have aggregated direct link packets with an |
188 | * ordinary base packet | 187 | * ordinary base packet |
189 | */ | 188 | */ |
@@ -261,7 +260,6 @@ static void batadv_iv_ogm_emit(struct batadv_forw_packet *forw_packet) | |||
261 | */ | 260 | */ |
262 | if ((directlink && (batadv_ogm_packet->header.ttl == 1)) || | 261 | if ((directlink && (batadv_ogm_packet->header.ttl == 1)) || |
263 | (forw_packet->own && (forw_packet->if_incoming != primary_if))) { | 262 | (forw_packet->own && (forw_packet->if_incoming != primary_if))) { |
264 | |||
265 | /* FIXME: what about aggregated packets ? */ | 263 | /* FIXME: what about aggregated packets ? */ |
266 | batadv_dbg(BATADV_DBG_BATMAN, bat_priv, | 264 | batadv_dbg(BATADV_DBG_BATMAN, bat_priv, |
267 | "%s packet (originator %pM, seqno %u, TTL %d) on interface %s [%pM]\n", | 265 | "%s packet (originator %pM, seqno %u, TTL %d) on interface %s [%pM]\n", |
@@ -325,7 +323,6 @@ batadv_iv_ogm_can_aggregate(const struct batadv_ogm_packet *new_bat_ogm_packet, | |||
325 | if (time_before(send_time, forw_packet->send_time) && | 323 | if (time_before(send_time, forw_packet->send_time) && |
326 | time_after_eq(aggregation_end_time, forw_packet->send_time) && | 324 | time_after_eq(aggregation_end_time, forw_packet->send_time) && |
327 | (aggregated_bytes <= BATADV_MAX_AGGREGATION_BYTES)) { | 325 | (aggregated_bytes <= BATADV_MAX_AGGREGATION_BYTES)) { |
328 | |||
329 | /* check aggregation compatibility | 326 | /* check aggregation compatibility |
330 | * -> direct link packets are broadcasted on | 327 | * -> direct link packets are broadcasted on |
331 | * their interface only | 328 | * their interface only |
@@ -815,7 +812,6 @@ static int batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, | |||
815 | rcu_read_lock(); | 812 | rcu_read_lock(); |
816 | hlist_for_each_entry_rcu(tmp_neigh_node, node, | 813 | hlist_for_each_entry_rcu(tmp_neigh_node, node, |
817 | &orig_neigh_node->neigh_list, list) { | 814 | &orig_neigh_node->neigh_list, list) { |
818 | |||
819 | if (!batadv_compare_eth(tmp_neigh_node->addr, | 815 | if (!batadv_compare_eth(tmp_neigh_node->addr, |
820 | orig_neigh_node->orig)) | 816 | orig_neigh_node->orig)) |
821 | continue; | 817 | continue; |
@@ -949,7 +945,6 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, | |||
949 | rcu_read_lock(); | 945 | rcu_read_lock(); |
950 | hlist_for_each_entry_rcu(tmp_neigh_node, node, | 946 | hlist_for_each_entry_rcu(tmp_neigh_node, node, |
951 | &orig_node->neigh_list, list) { | 947 | &orig_node->neigh_list, list) { |
952 | |||
953 | is_duplicate |= batadv_test_bit(tmp_neigh_node->real_bits, | 948 | is_duplicate |= batadv_test_bit(tmp_neigh_node->real_bits, |
954 | orig_node->last_real_seqno, | 949 | orig_node->last_real_seqno, |
955 | seqno); | 950 | seqno); |
@@ -1223,7 +1218,6 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, | |||
1223 | 1218 | ||
1224 | /* is single hop (direct) neighbor */ | 1219 | /* is single hop (direct) neighbor */ |
1225 | if (is_single_hop_neigh) { | 1220 | if (is_single_hop_neigh) { |
1226 | |||
1227 | /* mark direct link on incoming interface */ | 1221 | /* mark direct link on incoming interface */ |
1228 | batadv_iv_ogm_forward(orig_node, ethhdr, batadv_ogm_packet, | 1222 | batadv_iv_ogm_forward(orig_node, ethhdr, batadv_ogm_packet, |
1229 | is_single_hop_neigh, | 1223 | is_single_hop_neigh, |
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index ec12c79104ec..724adf053dcc 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c | |||
@@ -235,7 +235,6 @@ batadv_bla_del_backbone_claims(struct batadv_backbone_gw *backbone_gw) | |||
235 | spin_lock_bh(list_lock); | 235 | spin_lock_bh(list_lock); |
236 | hlist_for_each_entry_safe(claim, node, node_tmp, | 236 | hlist_for_each_entry_safe(claim, node, node_tmp, |
237 | head, hash_entry) { | 237 | head, hash_entry) { |
238 | |||
239 | if (claim->backbone_gw != backbone_gw) | 238 | if (claim->backbone_gw != backbone_gw) |
240 | continue; | 239 | continue; |
241 | 240 | ||
@@ -338,7 +337,6 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, | |||
338 | "bla_send_claim(): REQUEST of %pM to %pMon vid %d\n", | 337 | "bla_send_claim(): REQUEST of %pM to %pMon vid %d\n", |
339 | ethhdr->h_source, ethhdr->h_dest, vid); | 338 | ethhdr->h_source, ethhdr->h_dest, vid); |
340 | break; | 339 | break; |
341 | |||
342 | } | 340 | } |
343 | 341 | ||
344 | if (vid != -1) | 342 | if (vid != -1) |
@@ -539,7 +537,6 @@ static void batadv_bla_send_announce(struct batadv_priv *bat_priv, | |||
539 | 537 | ||
540 | batadv_bla_send_claim(bat_priv, mac, backbone_gw->vid, | 538 | batadv_bla_send_claim(bat_priv, mac, backbone_gw->vid, |
541 | BATADV_CLAIM_TYPE_ANNOUNCE); | 539 | BATADV_CLAIM_TYPE_ANNOUNCE); |
542 | |||
543 | } | 540 | } |
544 | 541 | ||
545 | /** | 542 | /** |
@@ -598,7 +595,6 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv, | |||
598 | 595 | ||
599 | claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN); | 596 | claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN); |
600 | batadv_backbone_gw_free_ref(claim->backbone_gw); | 597 | batadv_backbone_gw_free_ref(claim->backbone_gw); |
601 | |||
602 | } | 598 | } |
603 | /* set (new) backbone gw */ | 599 | /* set (new) backbone gw */ |
604 | atomic_inc(&backbone_gw->refcount); | 600 | atomic_inc(&backbone_gw->refcount); |
diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c index 6f58ddd53bff..0049837e1f2a 100644 --- a/net/batman-adv/debugfs.c +++ b/net/batman-adv/debugfs.c | |||
@@ -164,7 +164,6 @@ static ssize_t batadv_log_read(struct file *file, char __user *buf, | |||
164 | 164 | ||
165 | buf++; | 165 | buf++; |
166 | i++; | 166 | i++; |
167 | |||
168 | } | 167 | } |
169 | 168 | ||
170 | spin_unlock_bh(&debug_log->lock); | 169 | spin_unlock_bh(&debug_log->lock); |
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 109081c49bbd..fa88b2bec986 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c | |||
@@ -184,7 +184,6 @@ void batadv_originator_free(struct batadv_priv *bat_priv) | |||
184 | spin_lock_bh(list_lock); | 184 | spin_lock_bh(list_lock); |
185 | hlist_for_each_entry_safe(orig_node, node, node_tmp, | 185 | hlist_for_each_entry_safe(orig_node, node, node_tmp, |
186 | head, hash_entry) { | 186 | head, hash_entry) { |
187 | |||
188 | hlist_del_rcu(node); | 187 | hlist_del_rcu(node); |
189 | batadv_orig_node_free_ref(orig_node); | 188 | batadv_orig_node_free_ref(orig_node); |
190 | } | 189 | } |
@@ -291,7 +290,6 @@ batadv_purge_orig_neighbors(struct batadv_priv *bat_priv, | |||
291 | /* for all neighbors towards this originator ... */ | 290 | /* for all neighbors towards this originator ... */ |
292 | hlist_for_each_entry_safe(neigh_node, node, node_tmp, | 291 | hlist_for_each_entry_safe(neigh_node, node, node_tmp, |
293 | &orig_node->neigh_list, list) { | 292 | &orig_node->neigh_list, list) { |
294 | |||
295 | last_seen = neigh_node->last_seen; | 293 | last_seen = neigh_node->last_seen; |
296 | if_incoming = neigh_node->if_incoming; | 294 | if_incoming = neigh_node->if_incoming; |
297 | 295 | ||
@@ -299,7 +297,6 @@ batadv_purge_orig_neighbors(struct batadv_priv *bat_priv, | |||
299 | (if_incoming->if_status == BATADV_IF_INACTIVE) || | 297 | (if_incoming->if_status == BATADV_IF_INACTIVE) || |
300 | (if_incoming->if_status == BATADV_IF_NOT_IN_USE) || | 298 | (if_incoming->if_status == BATADV_IF_NOT_IN_USE) || |
301 | (if_incoming->if_status == BATADV_IF_TO_BE_REMOVED)) { | 299 | (if_incoming->if_status == BATADV_IF_TO_BE_REMOVED)) { |
302 | |||
303 | if ((if_incoming->if_status == BATADV_IF_INACTIVE) || | 300 | if ((if_incoming->if_status == BATADV_IF_INACTIVE) || |
304 | (if_incoming->if_status == BATADV_IF_NOT_IN_USE) || | 301 | (if_incoming->if_status == BATADV_IF_NOT_IN_USE) || |
305 | (if_incoming->if_status == BATADV_IF_TO_BE_REMOVED)) | 302 | (if_incoming->if_status == BATADV_IF_TO_BE_REMOVED)) |
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 1aa1722d0187..db89238d6767 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c | |||
@@ -80,7 +80,6 @@ static void _batadv_update_route(struct batadv_priv *bat_priv, | |||
80 | 80 | ||
81 | /* route added */ | 81 | /* route added */ |
82 | } else if ((!curr_router) && (neigh_node)) { | 82 | } else if ((!curr_router) && (neigh_node)) { |
83 | |||
84 | batadv_dbg(BATADV_DBG_ROUTES, bat_priv, | 83 | batadv_dbg(BATADV_DBG_ROUTES, bat_priv, |
85 | "Adding route towards: %pM (via %pM)\n", | 84 | "Adding route towards: %pM (via %pM)\n", |
86 | orig_node->orig, neigh_node->addr); | 85 | orig_node->orig, neigh_node->addr); |
@@ -172,7 +171,6 @@ void batadv_bonding_candidate_add(struct batadv_orig_node *orig_node, | |||
172 | */ | 171 | */ |
173 | hlist_for_each_entry_rcu(tmp_neigh_node, node, | 172 | hlist_for_each_entry_rcu(tmp_neigh_node, node, |
174 | &orig_node->neigh_list, list) { | 173 | &orig_node->neigh_list, list) { |
175 | |||
176 | if (tmp_neigh_node == neigh_node) | 174 | if (tmp_neigh_node == neigh_node) |
177 | continue; | 175 | continue; |
178 | 176 | ||
@@ -836,7 +834,6 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, | |||
836 | if (unicast_packet->header.packet_type == BATADV_UNICAST_FRAG && | 834 | if (unicast_packet->header.packet_type == BATADV_UNICAST_FRAG && |
837 | batadv_frag_can_reassemble(skb, | 835 | batadv_frag_can_reassemble(skb, |
838 | neigh_node->if_incoming->net_dev->mtu)) { | 836 | neigh_node->if_incoming->net_dev->mtu)) { |
839 | |||
840 | ret = batadv_frag_reassemble_skb(skb, bat_priv, &new_skb); | 837 | ret = batadv_frag_reassemble_skb(skb, bat_priv, &new_skb); |
841 | 838 | ||
842 | if (ret == NET_RX_DROP) | 839 | if (ret == NET_RX_DROP) |
@@ -1103,7 +1100,6 @@ int batadv_recv_ucast_frag_packet(struct sk_buff *skb, | |||
1103 | 1100 | ||
1104 | /* packet for me */ | 1101 | /* packet for me */ |
1105 | if (batadv_is_my_mac(unicast_packet->dest)) { | 1102 | if (batadv_is_my_mac(unicast_packet->dest)) { |
1106 | |||
1107 | ret = batadv_frag_reassemble_skb(skb, bat_priv, &new_skb); | 1103 | ret = batadv_frag_reassemble_skb(skb, bat_priv, &new_skb); |
1108 | 1104 | ||
1109 | if (ret == NET_RX_DROP) | 1105 | if (ret == NET_RX_DROP) |
diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 4425af9dad40..89810cea0530 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c | |||
@@ -330,7 +330,6 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, | |||
330 | spin_lock_bh(&bat_priv->forw_bcast_list_lock); | 330 | spin_lock_bh(&bat_priv->forw_bcast_list_lock); |
331 | hlist_for_each_entry_safe(forw_packet, tmp_node, safe_tmp_node, | 331 | hlist_for_each_entry_safe(forw_packet, tmp_node, safe_tmp_node, |
332 | &bat_priv->forw_bcast_list, list) { | 332 | &bat_priv->forw_bcast_list, list) { |
333 | |||
334 | /* if purge_outstanding_packets() was called with an argument | 333 | /* if purge_outstanding_packets() was called with an argument |
335 | * we delete only packets belonging to the given interface | 334 | * we delete only packets belonging to the given interface |
336 | */ | 335 | */ |
@@ -357,7 +356,6 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, | |||
357 | spin_lock_bh(&bat_priv->forw_bat_list_lock); | 356 | spin_lock_bh(&bat_priv->forw_bat_list_lock); |
358 | hlist_for_each_entry_safe(forw_packet, tmp_node, safe_tmp_node, | 357 | hlist_for_each_entry_safe(forw_packet, tmp_node, safe_tmp_node, |
359 | &bat_priv->forw_bat_list, list) { | 358 | &bat_priv->forw_bat_list, list) { |
360 | |||
361 | /* if purge_outstanding_packets() was called with an argument | 359 | /* if purge_outstanding_packets() was called with an argument |
362 | * we delete only packets belonging to the given interface | 360 | * we delete only packets belonging to the given interface |
363 | */ | 361 | */ |
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index c6fd0b760d3e..d4b27b65d6e9 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c | |||
@@ -116,7 +116,6 @@ batadv_tt_global_hash_find(struct batadv_priv *bat_priv, const void *data) | |||
116 | struct batadv_tt_global_entry, | 116 | struct batadv_tt_global_entry, |
117 | common); | 117 | common); |
118 | return tt_global_entry; | 118 | return tt_global_entry; |
119 | |||
120 | } | 119 | } |
121 | 120 | ||
122 | static void | 121 | static void |
@@ -256,7 +255,6 @@ static void batadv_tt_global_free(struct batadv_priv *bat_priv, | |||
256 | batadv_hash_remove(bat_priv->tt.global_hash, batadv_compare_tt, | 255 | batadv_hash_remove(bat_priv->tt.global_hash, batadv_compare_tt, |
257 | batadv_choose_orig, tt_global->common.addr); | 256 | batadv_choose_orig, tt_global->common.addr); |
258 | batadv_tt_global_entry_free_ref(tt_global); | 257 | batadv_tt_global_entry_free_ref(tt_global); |
259 | |||
260 | } | 258 | } |
261 | 259 | ||
262 | void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, | 260 | void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, |
@@ -652,7 +650,6 @@ static void batadv_tt_local_purge(struct batadv_priv *bat_priv) | |||
652 | batadv_tt_local_purge_list(bat_priv, head); | 650 | batadv_tt_local_purge_list(bat_priv, head); |
653 | spin_unlock_bh(list_lock); | 651 | spin_unlock_bh(list_lock); |
654 | } | 652 | } |
655 | |||
656 | } | 653 | } |
657 | 654 | ||
658 | static void batadv_tt_local_table_free(struct batadv_priv *bat_priv) | 655 | static void batadv_tt_local_table_free(struct batadv_priv *bat_priv) |
@@ -1079,7 +1076,6 @@ batadv_tt_global_del_orig_list(struct batadv_tt_global_entry *tt_global_entry) | |||
1079 | batadv_tt_orig_list_entry_free_ref(orig_entry); | 1076 | batadv_tt_orig_list_entry_free_ref(orig_entry); |
1080 | } | 1077 | } |
1081 | spin_unlock_bh(&tt_global_entry->list_lock); | 1078 | spin_unlock_bh(&tt_global_entry->list_lock); |
1082 | |||
1083 | } | 1079 | } |
1084 | 1080 | ||
1085 | static void | 1081 | static void |
@@ -1855,7 +1851,6 @@ out: | |||
1855 | if (!ret) | 1851 | if (!ret) |
1856 | kfree_skb(skb); | 1852 | kfree_skb(skb); |
1857 | return ret; | 1853 | return ret; |
1858 | |||
1859 | } | 1854 | } |
1860 | 1855 | ||
1861 | static bool | 1856 | static bool |
@@ -2382,7 +2377,6 @@ static void batadv_tt_local_purge_pending_clients(struct batadv_priv *bat_priv) | |||
2382 | } | 2377 | } |
2383 | spin_unlock_bh(list_lock); | 2378 | spin_unlock_bh(list_lock); |
2384 | } | 2379 | } |
2385 | |||
2386 | } | 2380 | } |
2387 | 2381 | ||
2388 | static int batadv_tt_commit_changes(struct batadv_priv *bat_priv, | 2382 | static int batadv_tt_commit_changes(struct batadv_priv *bat_priv, |
@@ -2579,7 +2573,6 @@ bool batadv_tt_local_client_is_roaming(struct batadv_priv *bat_priv, | |||
2579 | batadv_tt_local_entry_free_ref(tt_local_entry); | 2573 | batadv_tt_local_entry_free_ref(tt_local_entry); |
2580 | out: | 2574 | out: |
2581 | return ret; | 2575 | return ret; |
2582 | |||
2583 | } | 2576 | } |
2584 | 2577 | ||
2585 | bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv, | 2578 | bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv, |
diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c index 10aff49fcf25..f56bccf4229e 100644 --- a/net/batman-adv/unicast.c +++ b/net/batman-adv/unicast.c | |||
@@ -133,7 +133,6 @@ batadv_frag_search_packet(struct list_head *head, | |||
133 | is_head = !!(up->flags & BATADV_UNI_FRAG_HEAD); | 133 | is_head = !!(up->flags & BATADV_UNI_FRAG_HEAD); |
134 | 134 | ||
135 | list_for_each_entry(tfp, head, list) { | 135 | list_for_each_entry(tfp, head, list) { |
136 | |||
137 | if (!tfp->skb) | 136 | if (!tfp->skb) |
138 | continue; | 137 | continue; |
139 | 138 | ||
@@ -162,7 +161,6 @@ void batadv_frag_list_free(struct list_head *head) | |||
162 | struct batadv_frag_packet_list_entry *pf, *tmp_pf; | 161 | struct batadv_frag_packet_list_entry *pf, *tmp_pf; |
163 | 162 | ||
164 | if (!list_empty(head)) { | 163 | if (!list_empty(head)) { |
165 | |||
166 | list_for_each_entry_safe(pf, tmp_pf, head, list) { | 164 | list_for_each_entry_safe(pf, tmp_pf, head, list) { |
167 | kfree_skb(pf->skb); | 165 | kfree_skb(pf->skb); |
168 | list_del(&pf->list); | 166 | list_del(&pf->list); |