diff options
author | Antonio Quartulli <antonio@meshcoding.com> | 2014-09-01 08:37:28 -0400 |
---|---|---|
committer | Antonio Quartulli <antonio@meshcoding.com> | 2015-01-07 11:21:56 -0500 |
commit | 8a3f8b6ac5c5791a04d0d30636190bfc68f2e37b (patch) | |
tree | 86e9704a7e5be05f7c0108dc82d5a6bb4de575db /net/batman-adv | |
parent | aa143d2837325d66150e1566b22b61f0c7a843c9 (diff) |
batman-adv: checkpatch - Please don't use multiple blank lines
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Diffstat (limited to 'net/batman-adv')
-rw-r--r-- | net/batman-adv/bat_iv_ogm.c | 2 | ||||
-rw-r--r-- | net/batman-adv/bitarray.c | 1 | ||||
-rw-r--r-- | net/batman-adv/bridge_loop_avoidance.c | 7 | ||||
-rw-r--r-- | net/batman-adv/fragmentation.c | 1 | ||||
-rw-r--r-- | net/batman-adv/main.c | 1 | ||||
-rw-r--r-- | net/batman-adv/originator.c | 1 | ||||
-rw-r--r-- | net/batman-adv/originator.h | 1 | ||||
-rw-r--r-- | net/batman-adv/routing.c | 1 | ||||
-rw-r--r-- | net/batman-adv/soft-interface.c | 1 | ||||
-rw-r--r-- | net/batman-adv/sysfs.c | 1 | ||||
-rw-r--r-- | net/batman-adv/translation-table.c | 1 |
11 files changed, 0 insertions, 18 deletions
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 73209f388fcb..4dd7c407b4cc 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include "bat_algo.h" | 26 | #include "bat_algo.h" |
27 | #include "network-coding.h" | 27 | #include "network-coding.h" |
28 | 28 | ||
29 | |||
30 | /** | 29 | /** |
31 | * enum batadv_dup_status - duplicate status | 30 | * enum batadv_dup_status - duplicate status |
32 | * @BATADV_NO_DUP: the packet is a duplicate | 31 | * @BATADV_NO_DUP: the packet is a duplicate |
@@ -1362,7 +1361,6 @@ out: | |||
1362 | return ret; | 1361 | return ret; |
1363 | } | 1362 | } |
1364 | 1363 | ||
1365 | |||
1366 | /** | 1364 | /** |
1367 | * batadv_iv_ogm_process_per_outif - process a batman iv OGM for an outgoing if | 1365 | * batadv_iv_ogm_process_per_outif - process a batman iv OGM for an outgoing if |
1368 | * @skb: the skb containing the OGM | 1366 | * @skb: the skb containing the OGM |
diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c index 9586750022f5..e3da07a64026 100644 --- a/net/batman-adv/bitarray.c +++ b/net/batman-adv/bitarray.c | |||
@@ -29,7 +29,6 @@ static void batadv_bitmap_shift_left(unsigned long *seq_bits, int32_t n) | |||
29 | bitmap_shift_left(seq_bits, seq_bits, n, BATADV_TQ_LOCAL_WINDOW_SIZE); | 29 | bitmap_shift_left(seq_bits, seq_bits, n, BATADV_TQ_LOCAL_WINDOW_SIZE); |
30 | } | 30 | } |
31 | 31 | ||
32 | |||
33 | /* receive and process one packet within the sequence number window. | 32 | /* receive and process one packet within the sequence number window. |
34 | * | 33 | * |
35 | * returns: | 34 | * returns: |
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 0f0ca433ce3c..4fc6cab7ed46 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c | |||
@@ -69,7 +69,6 @@ static inline uint32_t batadv_choose_backbone_gw(const void *data, | |||
69 | return hash % size; | 69 | return hash % size; |
70 | } | 70 | } |
71 | 71 | ||
72 | |||
73 | /* compares address and vid of two backbone gws */ | 72 | /* compares address and vid of two backbone gws */ |
74 | static int batadv_compare_backbone_gw(const struct hlist_node *node, | 73 | static int batadv_compare_backbone_gw(const struct hlist_node *node, |
75 | const void *data2) | 74 | const void *data2) |
@@ -662,7 +661,6 @@ static int batadv_handle_announce(struct batadv_priv *bat_priv, | |||
662 | if (unlikely(!backbone_gw)) | 661 | if (unlikely(!backbone_gw)) |
663 | return 1; | 662 | return 1; |
664 | 663 | ||
665 | |||
666 | /* handle as ANNOUNCE frame */ | 664 | /* handle as ANNOUNCE frame */ |
667 | backbone_gw->lasttime = jiffies; | 665 | backbone_gw->lasttime = jiffies; |
668 | crc = ntohs(*((__be16 *)(&an_addr[4]))); | 666 | crc = ntohs(*((__be16 *)(&an_addr[4]))); |
@@ -849,7 +847,6 @@ static int batadv_check_claim_group(struct batadv_priv *bat_priv, | |||
849 | return 2; | 847 | return 2; |
850 | } | 848 | } |
851 | 849 | ||
852 | |||
853 | /** | 850 | /** |
854 | * batadv_bla_process_claim | 851 | * batadv_bla_process_claim |
855 | * @bat_priv: the bat priv with all the soft interface information | 852 | * @bat_priv: the bat priv with all the soft interface information |
@@ -1347,8 +1344,6 @@ out: | |||
1347 | return ret; | 1344 | return ret; |
1348 | } | 1345 | } |
1349 | 1346 | ||
1350 | |||
1351 | |||
1352 | /** | 1347 | /** |
1353 | * batadv_bla_is_backbone_gw_orig | 1348 | * batadv_bla_is_backbone_gw_orig |
1354 | * @bat_priv: the bat priv with all the soft interface information | 1349 | * @bat_priv: the bat priv with all the soft interface information |
@@ -1390,7 +1385,6 @@ bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig, | |||
1390 | return false; | 1385 | return false; |
1391 | } | 1386 | } |
1392 | 1387 | ||
1393 | |||
1394 | /** | 1388 | /** |
1395 | * batadv_bla_is_backbone_gw | 1389 | * batadv_bla_is_backbone_gw |
1396 | * @skb: the frame to be checked | 1390 | * @skb: the frame to be checked |
@@ -1480,7 +1474,6 @@ int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, | |||
1480 | if (!atomic_read(&bat_priv->bridge_loop_avoidance)) | 1474 | if (!atomic_read(&bat_priv->bridge_loop_avoidance)) |
1481 | goto allow; | 1475 | goto allow; |
1482 | 1476 | ||
1483 | |||
1484 | if (unlikely(atomic_read(&bat_priv->bla.num_requests))) | 1477 | if (unlikely(atomic_read(&bat_priv->bla.num_requests))) |
1485 | /* don't allow broadcasts while requests are in flight */ | 1478 | /* don't allow broadcasts while requests are in flight */ |
1486 | if (is_multicast_ether_addr(ethhdr->h_dest) && is_bcast) | 1479 | if (is_multicast_ether_addr(ethhdr->h_dest) && is_bcast) |
diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 00f9e144cc97..3d1dcaa3e8b5 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include "hard-interface.h" | 23 | #include "hard-interface.h" |
24 | #include "soft-interface.h" | 24 | #include "soft-interface.h" |
25 | 25 | ||
26 | |||
27 | /** | 26 | /** |
28 | * batadv_frag_clear_chain - delete entries in the fragment buffer chain | 27 | * batadv_frag_clear_chain - delete entries in the fragment buffer chain |
29 | * @head: head of chain with entries. | 28 | * @head: head of chain with entries. |
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 2cdd25a200bb..d4079cd510f9 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c | |||
@@ -41,7 +41,6 @@ | |||
41 | #include "network-coding.h" | 41 | #include "network-coding.h" |
42 | #include "fragmentation.h" | 42 | #include "fragmentation.h" |
43 | 43 | ||
44 | |||
45 | /* List manipulations on hardif_list have to be rtnl_lock()'ed, | 44 | /* List manipulations on hardif_list have to be rtnl_lock()'ed, |
46 | * list traversals just rcu-locked | 45 | * list traversals just rcu-locked |
47 | */ | 46 | */ |
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index bea8198d0198..90e805aba379 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c | |||
@@ -797,7 +797,6 @@ batadv_purge_orig_ifinfo(struct batadv_priv *bat_priv, | |||
797 | return ifinfo_purged; | 797 | return ifinfo_purged; |
798 | } | 798 | } |
799 | 799 | ||
800 | |||
801 | /** | 800 | /** |
802 | * batadv_purge_orig_neighbors - purges neighbors from originator | 801 | * batadv_purge_orig_neighbors - purges neighbors from originator |
803 | * @bat_priv: the bat priv with all the soft interface information | 802 | * @bat_priv: the bat priv with all the soft interface information |
diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h index db3a9ed734cb..aa4a43696295 100644 --- a/net/batman-adv/originator.h +++ b/net/batman-adv/originator.h | |||
@@ -70,7 +70,6 @@ batadv_orig_node_vlan_get(struct batadv_orig_node *orig_node, | |||
70 | unsigned short vid); | 70 | unsigned short vid); |
71 | void batadv_orig_node_vlan_free_ref(struct batadv_orig_node_vlan *orig_vlan); | 71 | void batadv_orig_node_vlan_free_ref(struct batadv_orig_node_vlan *orig_vlan); |
72 | 72 | ||
73 | |||
74 | /* hashfunction to choose an entry in a hash table of given size | 73 | /* hashfunction to choose an entry in a hash table of given size |
75 | * hash algorithm from http://en.wikipedia.org/wiki/Hash_table | 74 | * hash algorithm from http://en.wikipedia.org/wiki/Hash_table |
76 | */ | 75 | */ |
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 6648f321864d..139d2f65728e 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c | |||
@@ -292,7 +292,6 @@ out: | |||
292 | return ret; | 292 | return ret; |
293 | } | 293 | } |
294 | 294 | ||
295 | |||
296 | int batadv_recv_icmp_packet(struct sk_buff *skb, | 295 | int batadv_recv_icmp_packet(struct sk_buff *skb, |
297 | struct batadv_hard_iface *recv_if) | 296 | struct batadv_hard_iface *recv_if) |
298 | { | 297 | { |
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 5467955eb27c..5ec31d7de24f 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c | |||
@@ -36,7 +36,6 @@ | |||
36 | #include "bridge_loop_avoidance.h" | 36 | #include "bridge_loop_avoidance.h" |
37 | #include "network-coding.h" | 37 | #include "network-coding.h" |
38 | 38 | ||
39 | |||
40 | static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd); | 39 | static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd); |
41 | static void batadv_get_drvinfo(struct net_device *dev, | 40 | static void batadv_get_drvinfo(struct net_device *dev, |
42 | struct ethtool_drvinfo *info); | 41 | struct ethtool_drvinfo *info); |
diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index f40cb0436eba..a75dc12f96f8 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c | |||
@@ -151,7 +151,6 @@ ssize_t batadv_show_##_name(struct kobject *kobj, \ | |||
151 | static BATADV_ATTR(_name, _mode, batadv_show_##_name, \ | 151 | static BATADV_ATTR(_name, _mode, batadv_show_##_name, \ |
152 | batadv_store_##_name) | 152 | batadv_store_##_name) |
153 | 153 | ||
154 | |||
155 | #define BATADV_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func) \ | 154 | #define BATADV_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func) \ |
156 | ssize_t batadv_store_##_name(struct kobject *kobj, \ | 155 | ssize_t batadv_store_##_name(struct kobject *kobj, \ |
157 | struct attribute *attr, char *buff, \ | 156 | struct attribute *attr, char *buff, \ |
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 38a804e1db0a..84e6f01b734f 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c | |||
@@ -1780,7 +1780,6 @@ static void batadv_tt_global_del(struct batadv_priv *bat_priv, | |||
1780 | batadv_tt_global_del_roaming(bat_priv, tt_global_entry, | 1780 | batadv_tt_global_del_roaming(bat_priv, tt_global_entry, |
1781 | orig_node, message); | 1781 | orig_node, message); |
1782 | 1782 | ||
1783 | |||
1784 | out: | 1783 | out: |
1785 | if (tt_global_entry) | 1784 | if (tt_global_entry) |
1786 | batadv_tt_global_entry_free_ref(tt_global_entry); | 1785 | batadv_tt_global_entry_free_ref(tt_global_entry); |