From: Antonio Quartulli <antonio-x4xJYDvStAgysxA8WJXlww@public.gmane.org>
To: davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
"Martin Hundebøll"
<martin-SHBFXCSm21MJGwgDXS7ZQA@public.gmane.org>,
b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r@public.gmane.org,
"Marek Lindner"
<mareklindner-rVWd3aGhH2z5bpWLKbzFeg@public.gmane.org>,
"Antonio Quartulli"
<antonio-x4xJYDvStAgysxA8WJXlww@public.gmane.org>
Subject: [PATCH 04/15] batman-adv: kernel doc fixes for bridge_loop_avoidance.c
Date: Thu, 8 Jan 2015 16:15:09 +0100 [thread overview]
Message-ID: <1420730120-9844-5-git-send-email-antonio@meshcoding.com> (raw)
In-Reply-To: <1420730120-9844-1-git-send-email-antonio-x4xJYDvStAgysxA8WJXlww@public.gmane.org>
From: Martin Hundebøll <martin-SHBFXCSm21MJGwgDXS7ZQA@public.gmane.org>
Signed-off-by: Martin Hundebøll <martin-SHBFXCSm21MJGwgDXS7ZQA@public.gmane.org>
Acked-by: Simon Wunderlich <sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org>
Signed-off-by: Marek Lindner <mareklindner-rVWd3aGhH2z5bpWLKbzFeg@public.gmane.org>
Signed-off-by: Antonio Quartulli <antonio-x4xJYDvStAgysxA8WJXlww@public.gmane.org>
---
net/batman-adv/bridge_loop_avoidance.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index a957c81..0f0ca43 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -252,7 +252,7 @@ batadv_bla_del_backbone_claims(struct batadv_bla_backbone_gw *backbone_gw)
/**
* batadv_bla_send_claim - sends a claim frame according to the provided info
* @bat_priv: the bat priv with all the soft interface information
- * @orig: the mac address to be announced within the claim
+ * @mac: the mac address to be announced within the claim
* @vid: the VLAN ID
* @claimtype: the type of the claim (CLAIM, UNCLAIM, ANNOUNCE, ...)
*/
@@ -364,6 +364,7 @@ out:
* @bat_priv: the bat priv with all the soft interface information
* @orig: the mac address of the originator
* @vid: the VLAN ID
+ * @own_backbone: set if the requested backbone is local
*
* searches for the backbone gw or creates a new one if it could not
* be found.
@@ -454,6 +455,7 @@ batadv_bla_update_own_backbone_gw(struct batadv_priv *bat_priv,
/**
* batadv_bla_answer_request - answer a bla request by sending own claims
* @bat_priv: the bat priv with all the soft interface information
+ * @primary_if: interface where the request came on
* @vid: the vid where the request came on
*
* Repeat all of our own claims, and finally send an ANNOUNCE frame
@@ -775,6 +777,7 @@ static int batadv_handle_claim(struct batadv_priv *bat_priv,
/**
* batadv_check_claim_group
* @bat_priv: the bat priv with all the soft interface information
+ * @primary_if: the primary interface of this batman interface
* @hw_src: the Hardware source in the ARP Header
* @hw_dst: the Hardware destination in the ARP Header
* @ethhdr: pointer to the Ethernet header of the claim frame
@@ -850,6 +853,7 @@ static int batadv_check_claim_group(struct batadv_priv *bat_priv,
/**
* batadv_bla_process_claim
* @bat_priv: the bat priv with all the soft interface information
+ * @primary_if: the primary hard interface of this batman soft interface
* @skb: the frame to be checked
*
* Check if this is a claim frame, and process it accordingly.
--
2.2.1
next prev parent reply other threads:[~2015-01-08 15:15 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-08 15:15 pull request: batman-adv 20150108 Antonio Quartulli
2015-01-08 15:15 ` [PATCH 03/15] batman-adv: kernel doc fixes for bat_iv_ogm.c Antonio Quartulli
2015-01-08 15:15 ` [PATCH 05/15] batman-adv: kernel doc fix for distributed-arp-table.h Antonio Quartulli
2015-01-08 15:15 ` [PATCH 07/15] batman-adv: checkpatch - else is not generally useful after a break or return Antonio Quartulli
2015-01-08 15:15 ` [PATCH 08/15] batman-adv: checkpatch - No space is necessary after a cast Antonio Quartulli
2015-01-08 15:15 ` [PATCH 09/15] batman-adv: checkpatch - Please use a blank line after declarations Antonio Quartulli
2015-01-08 15:15 ` [PATCH 10/15] batman-adv: checkpatch - Please don't use multiple blank lines Antonio Quartulli
2015-01-08 15:15 ` [PATCH 11/15] batman-adv: checkpatch - remove unnecessary parentheses Antonio Quartulli
2015-01-08 15:15 ` [PATCH 12/15] batman-adv: clear control block of received socket buffers Antonio Quartulli
2015-01-08 15:15 ` [PATCH 13/15] batman-adv: fix misspelled words Antonio Quartulli
[not found] ` <1420730120-9844-1-git-send-email-antonio-x4xJYDvStAgysxA8WJXlww@public.gmane.org>
2015-01-08 15:15 ` [PATCH 01/15] batman-adv: avoid useless return in void functions Antonio Quartulli
2015-01-08 15:15 ` [PATCH 02/15] batman-adv: remove obsolete variable primary_iface from orig_node Antonio Quartulli
2015-01-08 15:15 ` Antonio Quartulli [this message]
2015-01-08 15:15 ` [PATCH 06/15] batman-adv: kernel doc fixes for main.{c, h} Antonio Quartulli
2015-01-08 15:15 ` [PATCH 14/15] batman-adv: Start new development cycle Antonio Quartulli
2015-01-08 15:15 ` [PATCH 15/15] batman-adv: Kconfig, Add missing DEBUG_FS dependency Antonio Quartulli
2015-01-09 4:14 ` pull request: batman-adv 20150108 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1420730120-9844-5-git-send-email-antonio@meshcoding.com \
--to=antonio-x4xjydvstagysxa8wjxlww@public.gmane.org \
--cc=b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r@public.gmane.org \
--cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org \
--cc=mareklindner-rVWd3aGhH2z5bpWLKbzFeg@public.gmane.org \
--cc=martin-SHBFXCSm21MJGwgDXS7ZQA@public.gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).