* [B.A.T.M.A.N.] pull request: batman-adv 2014-01-16
@ 2014-01-15 23:24 ` Antonio Quartulli
0 siblings, 0 replies; 6+ messages in thread
From: Antonio Quartulli @ 2014-01-15 23:24 UTC (permalink / raw)
To: davem; +Cc: netdev, b.a.t.m.a.n
Hello David,
here you have one more change by Simon Wunderlich intended for
net-next/linux-3.14.
This patch is properly formatting some kerneldoc that we already had but
which has not been written down in a proper way.
Please pull or let me know if something is wrong!
Thanks a lot,
Antonio
The following changes since commit b93819854d6e79999a01ae73f90d3a4b06816cf7:
stmmac: Add vlan rx for better GRO performance. (2014-01-15 15:13:08 -0800)
are available in the git repository at:
git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem
for you to fetch changes up to 1b371d13071d6b6b9dc7a00fe1bc5a6babd68a5b:
batman-adv: use consistent kerneldoc style (2014-01-16 00:16:00 +0100)
----------------------------------------------------------------
Included change:
- properly format already existing kerneldoc
----------------------------------------------------------------
Simon Wunderlich (1):
batman-adv: use consistent kerneldoc style
net/batman-adv/bat_iv_ogm.c | 6 ++++--
net/batman-adv/bridge_loop_avoidance.c | 24 ++++++++++++++++++------
net/batman-adv/translation-table.c | 8 +++++---
net/batman-adv/types.h | 6 ++++--
4 files changed, 31 insertions(+), 13 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread* pull request: batman-adv 2014-01-16 @ 2014-01-15 23:24 ` Antonio Quartulli 0 siblings, 0 replies; 6+ messages in thread From: Antonio Quartulli @ 2014-01-15 23:24 UTC (permalink / raw) To: davem; +Cc: netdev, b.a.t.m.a.n Hello David, here you have one more change by Simon Wunderlich intended for net-next/linux-3.14. This patch is properly formatting some kerneldoc that we already had but which has not been written down in a proper way. Please pull or let me know if something is wrong! Thanks a lot, Antonio The following changes since commit b93819854d6e79999a01ae73f90d3a4b06816cf7: stmmac: Add vlan rx for better GRO performance. (2014-01-15 15:13:08 -0800) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to 1b371d13071d6b6b9dc7a00fe1bc5a6babd68a5b: batman-adv: use consistent kerneldoc style (2014-01-16 00:16:00 +0100) ---------------------------------------------------------------- Included change: - properly format already existing kerneldoc ---------------------------------------------------------------- Simon Wunderlich (1): batman-adv: use consistent kerneldoc style net/batman-adv/bat_iv_ogm.c | 6 ++++-- net/batman-adv/bridge_loop_avoidance.c | 24 ++++++++++++++++++------ net/batman-adv/translation-table.c | 8 +++++--- net/batman-adv/types.h | 6 ++++-- 4 files changed, 31 insertions(+), 13 deletions(-) ^ permalink raw reply [flat|nested] 6+ messages in thread
* [B.A.T.M.A.N.] [PATCH] batman-adv: use consistent kerneldoc style 2014-01-15 23:24 ` Antonio Quartulli @ 2014-01-15 23:24 ` Antonio Quartulli -1 siblings, 0 replies; 6+ messages in thread From: Antonio Quartulli @ 2014-01-15 23:24 UTC (permalink / raw) To: davem; +Cc: netdev, b.a.t.m.a.n, Marek Lindner, Antonio Quartulli From: Simon Wunderlich <sw@simonwunderlich.de> Reported-by: Antonio Quartulli <antonio@meshcoding.com> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch> Signed-off-by: Antonio Quartulli <antonio@meshcoding.com> --- net/batman-adv/bat_iv_ogm.c | 6 ++++-- net/batman-adv/bridge_loop_avoidance.c | 24 ++++++++++++++++++------ net/batman-adv/translation-table.c | 8 +++++--- net/batman-adv/types.h | 6 ++++-- 4 files changed, 31 insertions(+), 13 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 921ac20..512159b 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -598,7 +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 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, 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 --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 5c0eda4..05f0712 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -130,7 +130,9 @@ static void batadv_claim_free_ref(struct batadv_bla_claim *claim) 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 @@ batadv_bla_update_own_backbone_gw(struct batadv_priv *bat_priv, 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 @@ static void batadv_bla_answer_request(struct batadv_priv *bat_priv, 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 @@ static void batadv_bla_send_request(struct batadv_bla_backbone_gw *backbone_gw) } } -/* @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 @@ static int batadv_check_claim_group(struct batadv_priv *bat_priv, } -/* @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 @@ 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 --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index a6fb1ff..b6071f6 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1382,7 +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 @@ batadv_transtable_best_orig(struct batadv_priv *bat_priv, 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 --git a/net/batman-adv/types.h b/net/batman-adv/types.h index b53f90d..78370ab 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -333,7 +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 @@ 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 -- 1.8.5.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] batman-adv: use consistent kerneldoc style @ 2014-01-15 23:24 ` Antonio Quartulli 0 siblings, 0 replies; 6+ messages in thread From: Antonio Quartulli @ 2014-01-15 23:24 UTC (permalink / raw) To: davem Cc: netdev, b.a.t.m.a.n, Simon Wunderlich, Marek Lindner, Antonio Quartulli From: Simon Wunderlich <sw@simonwunderlich.de> Reported-by: Antonio Quartulli <antonio@meshcoding.com> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch> Signed-off-by: Antonio Quartulli <antonio@meshcoding.com> --- net/batman-adv/bat_iv_ogm.c | 6 ++++-- net/batman-adv/bridge_loop_avoidance.c | 24 ++++++++++++++++++------ net/batman-adv/translation-table.c | 8 +++++--- net/batman-adv/types.h | 6 ++++-- 4 files changed, 31 insertions(+), 13 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 921ac20..512159b 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -598,7 +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 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, 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 --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 5c0eda4..05f0712 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -130,7 +130,9 @@ static void batadv_claim_free_ref(struct batadv_bla_claim *claim) 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 @@ batadv_bla_update_own_backbone_gw(struct batadv_priv *bat_priv, 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 @@ static void batadv_bla_answer_request(struct batadv_priv *bat_priv, 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 @@ static void batadv_bla_send_request(struct batadv_bla_backbone_gw *backbone_gw) } } -/* @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 @@ static int batadv_check_claim_group(struct batadv_priv *bat_priv, } -/* @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 @@ 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 --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index a6fb1ff..b6071f6 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1382,7 +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 @@ batadv_transtable_best_orig(struct batadv_priv *bat_priv, 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 --git a/net/batman-adv/types.h b/net/batman-adv/types.h index b53f90d..78370ab 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -333,7 +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 @@ 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 -- 1.8.5.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [B.A.T.M.A.N.] pull request: batman-adv 2014-01-16 2014-01-15 23:24 ` Antonio Quartulli @ 2014-01-17 1:23 ` David Miller -1 siblings, 0 replies; 6+ messages in thread From: David Miller @ 2014-01-17 1:23 UTC (permalink / raw) To: antonio; +Cc: netdev, b.a.t.m.a.n From: Antonio Quartulli <antonio@meshcoding.com> Date: Thu, 16 Jan 2014 00:24:22 +0100 > here you have one more change by Simon Wunderlich intended for > net-next/linux-3.14. > > This patch is properly formatting some kerneldoc that we already had but > which has not been written down in a proper way. > > Please pull or let me know if something is wrong! Pulled, thanks. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pull request: batman-adv 2014-01-16 @ 2014-01-17 1:23 ` David Miller 0 siblings, 0 replies; 6+ messages in thread From: David Miller @ 2014-01-17 1:23 UTC (permalink / raw) To: antonio; +Cc: netdev, b.a.t.m.a.n From: Antonio Quartulli <antonio@meshcoding.com> Date: Thu, 16 Jan 2014 00:24:22 +0100 > here you have one more change by Simon Wunderlich intended for > net-next/linux-3.14. > > This patch is properly formatting some kerneldoc that we already had but > which has not been written down in a proper way. > > Please pull or let me know if something is wrong! Pulled, thanks. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-01-17 1:23 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-01-15 23:24 [B.A.T.M.A.N.] pull request: batman-adv 2014-01-16 Antonio Quartulli 2014-01-15 23:24 ` Antonio Quartulli 2014-01-15 23:24 ` [B.A.T.M.A.N.] [PATCH] batman-adv: use consistent kerneldoc style Antonio Quartulli 2014-01-15 23:24 ` Antonio Quartulli 2014-01-17 1:23 ` [B.A.T.M.A.N.] pull request: batman-adv 2014-01-16 David Miller 2014-01-17 1:23 ` David Miller
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.