From: Sven Eckelmann <[email protected]> The bridge-loop-avoidance code was changed recently to avoid inconsistent state and race condition problems. The kernel-doc addded in these commits (and related code) has various minor deficits which are now resolved.
Signed-off-by: Sven Eckelmann <[email protected]> Signed-off-by: Simon Wunderlich <[email protected]> --- net/batman-adv/bridge_loop_avoidance.c | 2 +- net/batman-adv/bridge_loop_avoidance.h | 2 +- net/batman-adv/types.h | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 0bd24a19ff202..5c73f6ba16cff 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -123,7 +123,7 @@ static bool batadv_compare_backbone_gw(const struct hlist_node *node, * @node: list node of the first entry to compare * @data2: pointer to the second claims * - * Return: true if the claim have the same data, 0 otherwise + * Return: true if the claims have the same data, false otherwise */ static bool batadv_compare_claim(const struct hlist_node *node, const void *data2) diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h index 8673a265995ff..06c7dfb8c677f 100644 --- a/net/batman-adv/bridge_loop_avoidance.h +++ b/net/batman-adv/bridge_loop_avoidance.h @@ -21,7 +21,7 @@ * detect frame sent by bridge loop avoidance * @mac: mac address to check * - * Return: true if the it looks like a loop detect frame + * Return: true if it looks like a loop detect frame * (mac starts with BA:BE), false otherwise */ static inline bool batadv_bla_is_loopdetect_mac(const uint8_t *mac) diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index a7fa0d9e09288..5fd5bd358a249 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1723,22 +1723,26 @@ struct batadv_priv { #ifdef CONFIG_BATMAN_ADV_BLA +/** + * enum batadv_bla_backbone_gw_state - state of a bridge loop avoidance + * backbone gateway + */ enum batadv_bla_backbone_gw_state { /** * @BATADV_BLA_BACKBONE_GW_STOPPED: backbone gw is being removed - * and it must not longer work on requests + * and it must no longer work on requests */ BATADV_BLA_BACKBONE_GW_STOPPED, /** * @BATADV_BLA_BACKBONE_GW_UNSYNCED: backbone was detected out - * of sync and a request was send. No traffic is forwarded until the + * of sync and a request was sent. No traffic is forwarded until the * situation is resolved */ BATADV_BLA_BACKBONE_GW_UNSYNCED, /** - * @BATADV_BLA_BACKBONE_GW_SYNCED: backbone is consider to be in + * @BATADV_BLA_BACKBONE_GW_SYNCED: backbone is considered to be in * sync. traffic can be forwarded */ BATADV_BLA_BACKBONE_GW_SYNCED, -- 2.47.3
