Message ID | 20210408115401.16988-2-sw@simonwunderlich.de |
---|---|
State | Not Applicable, archived |
Delegated to: | Simon Wunderlich |
Headers | show |
Series | [1/3] batman-adv: Fix order of kernel doc in batadv_priv | expand |
Hello: This series was applied to netdev/net-next.git (refs/heads/master): On Thu, 8 Apr 2021 13:53:59 +0200 you wrote: > From: Linus Lüssing <linus.luessing@c0d3.blue> > > During the inlining process of kerneldoc in commit 8b84cc4fb556 > ("batman-adv: Use inline kernel-doc for enum/struct"), some comments were > placed at the wrong struct members. Fixing this by reordering the comments. > > Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue> > Signed-off-by: Sven Eckelmann <sven@narfation.org> > Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> > > [...] Here is the summary with links: - [1/3] batman-adv: Fix order of kernel doc in batadv_priv https://git.kernel.org/netdev/net-next/c/549750babea1 - [2/3] batman-adv: Drop unused header preempt.h https://git.kernel.org/netdev/net-next/c/5fc087ff96fd - [3/3] batman-adv: Fix misspelled "wont" https://git.kernel.org/netdev/net-next/c/35796c1d3438 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 7c0b475cc22a..2be5d4a712c5 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1659,19 +1659,19 @@ struct batadv_priv { /** @tp_list: list of tp sessions */ struct hlist_head tp_list; - /** @tp_num: number of currently active tp sessions */ + /** @orig_hash: hash table containing mesh participants (orig nodes) */ struct batadv_hashtable *orig_hash; - /** @orig_hash: hash table containing mesh participants (orig nodes) */ + /** @forw_bat_list_lock: lock protecting forw_bat_list */ spinlock_t forw_bat_list_lock; - /** @forw_bat_list_lock: lock protecting forw_bat_list */ + /** @forw_bcast_list_lock: lock protecting forw_bcast_list */ spinlock_t forw_bcast_list_lock; - /** @forw_bcast_list_lock: lock protecting forw_bcast_list */ + /** @tp_list_lock: spinlock protecting @tp_list */ spinlock_t tp_list_lock; - /** @tp_list_lock: spinlock protecting @tp_list */ + /** @tp_num: number of currently active tp sessions */ atomic_t tp_num; /** @orig_work: work queue callback item for orig node purging */