The following commit has been merged in the merge/master branch: commit 669cbd55edae689ce151bc17860f9cd236b72c5e Merge: 5dbc980182623f66508ad59d66f1c911f83e4496 4b78c87e26da64e8c1f586391917b50e243fac9b Author: Antonio Quartulli antonio@meshcoding.com Date: Wed Jan 15 23:52:07 2014 +0100

Merge commit '4b78c87e26da64e8c1f586391917b50e243fac9b' into merge/master

diff --combined net/batman-adv/bat_iv_ogm.c index 921ac20,512159b..512159b --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@@ -598,7 -598,8 +598,8 @@@ out return res; }

- /* batadv_iv_ogm_aggregate_new - create a new aggregated packet and add this + /** + * batadv_iv_ogm_aggregate_new - create a new aggregated packet and add this * packet to it. * @packet_buff: pointer to the OGM * @packet_len: (total) length of the OGM @@@ -1745,7 -1746,8 +1746,8 @@@ static int batadv_iv_ogm_receive(struc return NET_RX_SUCCESS; }

- /* batadv_iv_ogm_orig_print_neigh - print neighbors for the originator table + /** + * batadv_iv_ogm_orig_print_neigh - print neighbors for the originator table * @orig_node: the orig_node for which the neighbors are printed * @if_outgoing: outgoing interface for these entries * @seq: debugfs table seq_file struct diff --combined net/batman-adv/bridge_loop_avoidance.c index 5c0eda4,05f0712..05f0712 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@@ -130,7 -130,9 +130,9 @@@ static void batadv_claim_free_ref(struc call_rcu(&claim->rcu, batadv_claim_free_rcu); }

- /* @bat_priv: the bat priv with all the soft interface information + /** + * batadv_claim_hash_find + * @bat_priv: the bat priv with all the soft interface information * @data: search data (may be local/static data) * * looks for a claim in the hash, and returns it if found @@@ -449,7 -451,9 +451,9 @@@ batadv_bla_update_own_backbone_gw(struc batadv_backbone_gw_free_ref(backbone_gw); }

- /* @bat_priv: the bat priv with all the soft interface information + /** + * batadv_bla_answer_request - answer a bla request by sending own claims + * @bat_priv: the bat priv with all the soft interface information * @vid: the vid where the request came on * * Repeat all of our own claims, and finally send an ANNOUNCE frame @@@ -495,7 -499,9 +499,9 @@@ static void batadv_bla_answer_request(s batadv_backbone_gw_free_ref(backbone_gw); }

- /* @backbone_gw: the backbone gateway from whom we are out of sync + /** + * batadv_bla_send_request - send a request to repeat claims + * @backbone_gw: the backbone gateway from whom we are out of sync * * When the crc is wrong, ask the backbone gateway for a full table update. * After the request, it will repeat all of his own claims and finally @@@ -520,7 -526,9 +526,9 @@@ static void batadv_bla_send_request(str } }

- /* @bat_priv: the bat priv with all the soft interface information + /** + * batadv_bla_send_announce + * @bat_priv: the bat priv with all the soft interface information * @backbone_gw: our backbone gateway which should be announced * * This function sends an announcement. It is called from multiple @@@ -844,7 -852,9 +852,9 @@@ static int batadv_check_claim_group(str }

- /* @bat_priv: the bat priv with all the soft interface information + /** + * batadv_bla_process_claim + * @bat_priv: the bat priv with all the soft interface information * @skb: the frame to be checked * * Check if this is a claim frame, and process it accordingly. @@@ -1311,7 -1321,9 +1321,9 @@@ out

- /* @bat_priv: the bat priv with all the soft interface information + /** + * batadv_bla_is_backbone_gw_orig + * @bat_priv: the bat priv with all the soft interface information * @orig: originator mac address * @vid: VLAN identifier * diff --combined net/batman-adv/main.c index e56b4d6,66ae135..66ae135 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@@ -275,7 -275,7 +275,7 @@@ int batadv_max_header_len(void sizeof(struct batadv_coded_packet)); #endif

- return header_len; + return header_len + ETH_HLEN; }

/** diff --combined net/batman-adv/translation-table.c index a6fb1ff,b6071f6..b6071f6 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -1382,7 -1382,8 +1382,8 @@@ out return ret; }

- /* batadv_transtable_best_orig - Get best originator list entry from tt entry + /** + * batadv_transtable_best_orig - Get best originator list entry from tt entry * @bat_priv: the bat priv with all the soft interface information * @tt_global_entry: global translation table entry to be analyzed * @@@ -1426,8 -1427,9 +1427,9 @@@ batadv_transtable_best_orig(struct bata return best_entry; }

- /* batadv_tt_global_print_entry - print all orig nodes who announce the address - * for this global entry + /** + * batadv_tt_global_print_entry - print all orig nodes who announce the address + * for this global entry * @bat_priv: the bat priv with all the soft interface information * @tt_global_entry: global translation table entry to be printed * @seq: debugfs table seq_file struct diff --combined net/batman-adv/types.h index b53f90d,78370ab..78370ab --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@@ -333,7 -333,8 +333,8 @@@ struct batadv_neigh_node struct rcu_head rcu; };

- /* struct batadv_neigh_node_bat_iv - neighbor information per outgoing + /** + * struct batadv_neigh_node_bat_iv - neighbor information per outgoing * interface for BATMAN IV * @tq_recv: ring buffer of received TQ values from this neigh node * @tq_index: ring buffer index @@@ -350,7 -351,8 +351,8 @@@ struct batadv_neigh_ifinfo_bat_iv uint8_t real_packet_count; };

- /* struct batadv_neigh_ifinfo - neighbor information per outgoing interface + /** + * struct batadv_neigh_ifinfo - neighbor information per outgoing interface * @list: list node for batadv_neigh_node::ifinfo_list * @if_outgoing: pointer to outgoing hard interface * @bat_iv: B.A.T.M.A.N. IV private structure