diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2012-07-10 06:55:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-11 02:13:45 -0400 |
commit | 2c53040f018b6c36a46eec75b9b937aaa5f78e6d (patch) | |
tree | f77d987c380f78daf40838688a5f49bb4ab065ee /net/batman-adv | |
parent | a55b138b1da3d25c04f66f8df03d659dfd46c950 (diff) |
net: Fix (nearly-)kernel-doc comments for various functions
Fix incorrect start markers, wrapped summary lines, missing section
breaks, incorrect separators, and some name mismatches.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv')
-rw-r--r-- | net/batman-adv/bridge_loop_avoidance.c | 51 | ||||
-rw-r--r-- | net/batman-adv/hash.h | 3 | ||||
-rw-r--r-- | net/batman-adv/main.h | 3 | ||||
-rw-r--r-- | net/batman-adv/types.h | 3 |
4 files changed, 40 insertions, 20 deletions
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 49e10d91c00b..3483e4035cbe 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c | |||
@@ -162,12 +162,13 @@ static struct batadv_claim *batadv_claim_hash_find(struct batadv_priv *bat_priv, | |||
162 | return claim_tmp; | 162 | return claim_tmp; |
163 | } | 163 | } |
164 | 164 | ||
165 | /* @bat_priv: the bat priv with all the soft interface information | 165 | /** |
166 | * batadv_backbone_hash_find - looks for a claim in the hash | ||
167 | * @bat_priv: the bat priv with all the soft interface information | ||
166 | * @addr: the address of the originator | 168 | * @addr: the address of the originator |
167 | * @vid: the VLAN ID | 169 | * @vid: the VLAN ID |
168 | * | 170 | * |
169 | * looks for a claim in the hash, and returns it if found | 171 | * Returns claim if found or NULL otherwise. |
170 | * or NULL otherwise. | ||
171 | */ | 172 | */ |
172 | static struct batadv_backbone_gw * | 173 | static struct batadv_backbone_gw * |
173 | batadv_backbone_hash_find(struct batadv_priv *bat_priv, | 174 | batadv_backbone_hash_find(struct batadv_priv *bat_priv, |
@@ -242,12 +243,12 @@ batadv_bla_del_backbone_claims(struct batadv_backbone_gw *backbone_gw) | |||
242 | backbone_gw->crc = BATADV_BLA_CRC_INIT; | 243 | backbone_gw->crc = BATADV_BLA_CRC_INIT; |
243 | } | 244 | } |
244 | 245 | ||
245 | /* @bat_priv: the bat priv with all the soft interface information | 246 | /** |
247 | * batadv_bla_send_claim - sends a claim frame according to the provided info | ||
248 | * @bat_priv: the bat priv with all the soft interface information | ||
246 | * @orig: the mac address to be announced within the claim | 249 | * @orig: the mac address to be announced within the claim |
247 | * @vid: the VLAN ID | 250 | * @vid: the VLAN ID |
248 | * @claimtype: the type of the claim (CLAIM, UNCLAIM, ANNOUNCE, ...) | 251 | * @claimtype: the type of the claim (CLAIM, UNCLAIM, ANNOUNCE, ...) |
249 | * | ||
250 | * sends a claim frame according to the provided info. | ||
251 | */ | 252 | */ |
252 | static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, | 253 | static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, |
253 | short vid, int claimtype) | 254 | short vid, int claimtype) |
@@ -348,7 +349,9 @@ out: | |||
348 | batadv_hardif_free_ref(primary_if); | 349 | batadv_hardif_free_ref(primary_if); |
349 | } | 350 | } |
350 | 351 | ||
351 | /* @bat_priv: the bat priv with all the soft interface information | 352 | /** |
353 | * batadv_bla_get_backbone_gw | ||
354 | * @bat_priv: the bat priv with all the soft interface information | ||
352 | * @orig: the mac address of the originator | 355 | * @orig: the mac address of the originator |
353 | * @vid: the VLAN ID | 356 | * @vid: the VLAN ID |
354 | * | 357 | * |
@@ -520,12 +523,12 @@ static void batadv_bla_send_announce(struct batadv_priv *bat_priv, | |||
520 | 523 | ||
521 | } | 524 | } |
522 | 525 | ||
523 | /* @bat_priv: the bat priv with all the soft interface information | 526 | /** |
527 | * batadv_bla_add_claim - Adds a claim in the claim hash | ||
528 | * @bat_priv: the bat priv with all the soft interface information | ||
524 | * @mac: the mac address of the claim | 529 | * @mac: the mac address of the claim |
525 | * @vid: the VLAN ID of the frame | 530 | * @vid: the VLAN ID of the frame |
526 | * @backbone_gw: the backbone gateway which claims it | 531 | * @backbone_gw: the backbone gateway which claims it |
527 | * | ||
528 | * Adds a claim in the claim hash. | ||
529 | */ | 532 | */ |
530 | static void batadv_bla_add_claim(struct batadv_priv *bat_priv, | 533 | static void batadv_bla_add_claim(struct batadv_priv *bat_priv, |
531 | const uint8_t *mac, const short vid, | 534 | const uint8_t *mac, const short vid, |
@@ -743,7 +746,9 @@ static int batadv_handle_claim(struct batadv_priv *bat_priv, | |||
743 | return 1; | 746 | return 1; |
744 | } | 747 | } |
745 | 748 | ||
746 | /* @bat_priv: the bat priv with all the soft interface information | 749 | /** |
750 | * batadv_check_claim_group | ||
751 | * @bat_priv: the bat priv with all the soft interface information | ||
747 | * @hw_src: the Hardware source in the ARP Header | 752 | * @hw_src: the Hardware source in the ARP Header |
748 | * @hw_dst: the Hardware destination in the ARP Header | 753 | * @hw_dst: the Hardware destination in the ARP Header |
749 | * @ethhdr: pointer to the Ethernet header of the claim frame | 754 | * @ethhdr: pointer to the Ethernet header of the claim frame |
@@ -975,7 +980,9 @@ purge_now: | |||
975 | } | 980 | } |
976 | } | 981 | } |
977 | 982 | ||
978 | /* @bat_priv: the bat priv with all the soft interface information | 983 | /** |
984 | * batadv_bla_purge_claims | ||
985 | * @bat_priv: the bat priv with all the soft interface information | ||
979 | * @primary_if: the selected primary interface, may be NULL if now is set | 986 | * @primary_if: the selected primary interface, may be NULL if now is set |
980 | * @now: whether the whole hash shall be wiped now | 987 | * @now: whether the whole hash shall be wiped now |
981 | * | 988 | * |
@@ -1023,7 +1030,9 @@ purge_now: | |||
1023 | } | 1030 | } |
1024 | } | 1031 | } |
1025 | 1032 | ||
1026 | /* @bat_priv: the bat priv with all the soft interface information | 1033 | /** |
1034 | * batadv_bla_update_orig_address | ||
1035 | * @bat_priv: the bat priv with all the soft interface information | ||
1027 | * @primary_if: the new selected primary_if | 1036 | * @primary_if: the new selected primary_if |
1028 | * @oldif: the old primary interface, may be NULL | 1037 | * @oldif: the old primary interface, may be NULL |
1029 | * | 1038 | * |
@@ -1193,7 +1202,9 @@ int batadv_bla_init(struct batadv_priv *bat_priv) | |||
1193 | return 0; | 1202 | return 0; |
1194 | } | 1203 | } |
1195 | 1204 | ||
1196 | /* @bat_priv: the bat priv with all the soft interface information | 1205 | /** |
1206 | * batadv_bla_check_bcast_duplist | ||
1207 | * @bat_priv: the bat priv with all the soft interface information | ||
1197 | * @bcast_packet: originator mac address | 1208 | * @bcast_packet: originator mac address |
1198 | * @hdr_size: maximum length of the frame | 1209 | * @hdr_size: maximum length of the frame |
1199 | * | 1210 | * |
@@ -1297,7 +1308,9 @@ int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig) | |||
1297 | } | 1308 | } |
1298 | 1309 | ||
1299 | 1310 | ||
1300 | /* @skb: the frame to be checked | 1311 | /** |
1312 | * batadv_bla_is_backbone_gw | ||
1313 | * @skb: the frame to be checked | ||
1301 | * @orig_node: the orig_node of the frame | 1314 | * @orig_node: the orig_node of the frame |
1302 | * @hdr_size: maximum length of the frame | 1315 | * @hdr_size: maximum length of the frame |
1303 | * | 1316 | * |
@@ -1363,7 +1376,9 @@ void batadv_bla_free(struct batadv_priv *bat_priv) | |||
1363 | batadv_hardif_free_ref(primary_if); | 1376 | batadv_hardif_free_ref(primary_if); |
1364 | } | 1377 | } |
1365 | 1378 | ||
1366 | /* @bat_priv: the bat priv with all the soft interface information | 1379 | /** |
1380 | * batadv_bla_rx | ||
1381 | * @bat_priv: the bat priv with all the soft interface information | ||
1367 | * @skb: the frame to be checked | 1382 | * @skb: the frame to be checked |
1368 | * @vid: the VLAN ID of the frame | 1383 | * @vid: the VLAN ID of the frame |
1369 | * | 1384 | * |
@@ -1450,7 +1465,9 @@ out: | |||
1450 | return ret; | 1465 | return ret; |
1451 | } | 1466 | } |
1452 | 1467 | ||
1453 | /* @bat_priv: the bat priv with all the soft interface information | 1468 | /** |
1469 | * batadv_bla_tx | ||
1470 | * @bat_priv: the bat priv with all the soft interface information | ||
1454 | * @skb: the frame to be checked | 1471 | * @skb: the frame to be checked |
1455 | * @vid: the VLAN ID of the frame | 1472 | * @vid: the VLAN ID of the frame |
1456 | * | 1473 | * |
diff --git a/net/batman-adv/hash.h b/net/batman-adv/hash.h index 83990e318e43..977de9c75fc2 100644 --- a/net/batman-adv/hash.h +++ b/net/batman-adv/hash.h | |||
@@ -81,7 +81,8 @@ static inline void batadv_hash_delete(struct batadv_hashtable *hash, | |||
81 | batadv_hash_destroy(hash); | 81 | batadv_hash_destroy(hash); |
82 | } | 82 | } |
83 | 83 | ||
84 | /* hash_add - adds data to the hashtable | 84 | /** |
85 | * batadv_hash_add - adds data to the hashtable | ||
85 | * @hash: storage hash table | 86 | * @hash: storage hash table |
86 | * @compare: callback to determine if 2 hash elements are identical | 87 | * @compare: callback to determine if 2 hash elements are identical |
87 | * @choose: callback calculating the hash index | 88 | * @choose: callback calculating the hash index |
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index b8d4ac17f001..5d8fa0757947 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h | |||
@@ -216,7 +216,8 @@ static inline int batadv_compare_eth(const void *data1, const void *data2) | |||
216 | return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0); | 216 | return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0); |
217 | } | 217 | } |
218 | 218 | ||
219 | /* has_timed_out - compares current time (jiffies) and timestamp + timeout | 219 | /** |
220 | * has_timed_out - compares current time (jiffies) and timestamp + timeout | ||
220 | * @timestamp: base value to compare with (in jiffies) | 221 | * @timestamp: base value to compare with (in jiffies) |
221 | * @timeout: added to base value before comparing (in milliseconds) | 222 | * @timeout: added to base value before comparing (in milliseconds) |
222 | * | 223 | * |
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 2141c1304898..12635fd2c3d3 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h | |||
@@ -44,7 +44,8 @@ struct batadv_hard_iface { | |||
44 | struct rcu_head rcu; | 44 | struct rcu_head rcu; |
45 | }; | 45 | }; |
46 | 46 | ||
47 | /* batadv_orig_node - structure for orig_list maintaining nodes of mesh | 47 | /** |
48 | * struct batadv_orig_node - structure for orig_list maintaining nodes of mesh | ||
48 | * @primary_addr: hosts primary interface address | 49 | * @primary_addr: hosts primary interface address |
49 | * @last_seen: when last packet from this node was received | 50 | * @last_seen: when last packet from this node was received |
50 | * @bcast_seqno_reset: time when the broadcast seqno window was reset | 51 | * @bcast_seqno_reset: time when the broadcast seqno window was reset |