* [PATCH 0/3] pull request for net-next: batman-adv 2021-04-08
@ 2021-04-08 11:53 Simon Wunderlich
2021-04-08 11:53 ` [PATCH 1/3] batman-adv: Fix order of kernel doc in batadv_priv Simon Wunderlich
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Simon Wunderlich @ 2021-04-08 11:53 UTC (permalink / raw)
To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich
Hi Jakub, hi David,
here is a little cleanup pull request of batman-adv to go into net-next.
Please pull or let me know of any problem!
Thank you,
Simon
The following changes since commit b1de0f01b0115575982cf24c88b35106449e9aa7:
batman-adv: Use netif_rx_any_context(). (2021-02-13 18:08:40 +0100)
are available in the Git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-pullrequest-20210408
for you to fetch changes up to 35796c1d343871fa75a6e6b0f4584182cbeae6ac:
batman-adv: Fix misspelled "wont" (2021-03-30 21:19:50 +0200)
----------------------------------------------------------------
This cleanup patchset includes the following patches:
- for kerneldoc in batadv_priv, by Linus Luessing
- drop unused header preempt.h, by Sven Eckelmann
- Fix misspelled "wont", by Sven Eckelmann
----------------------------------------------------------------
Linus Lüssing (1):
batman-adv: Fix order of kernel doc in batadv_priv
Sven Eckelmann (2):
batman-adv: Drop unused header preempt.h
batman-adv: Fix misspelled "wont"
net/batman-adv/bat_iv_ogm.c | 2 +-
net/batman-adv/bridge_loop_avoidance.c | 1 -
net/batman-adv/types.h | 10 +++++-----
3 files changed, 6 insertions(+), 7 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/3] batman-adv: Fix order of kernel doc in batadv_priv
2021-04-08 11:53 [PATCH 0/3] pull request for net-next: batman-adv 2021-04-08 Simon Wunderlich
@ 2021-04-08 11:53 ` Simon Wunderlich
2021-04-08 21:30 ` patchwork-bot+netdevbpf
2021-04-08 11:54 ` [PATCH 2/3] batman-adv: Drop unused header preempt.h Simon Wunderlich
2021-04-08 11:54 ` [PATCH 3/3] batman-adv: Fix misspelled "wont" Simon Wunderlich
2 siblings, 1 reply; 5+ messages in thread
From: Simon Wunderlich @ 2021-04-08 11:53 UTC (permalink / raw)
To: kuba, davem
Cc: netdev, b.a.t.m.a.n, Linus Lüssing, Sven Eckelmann,
Simon Wunderlich
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>
---
net/batman-adv/types.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
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 */
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/3] batman-adv: Fix order of kernel doc in batadv_priv
2021-04-08 11:53 ` [PATCH 1/3] batman-adv: Fix order of kernel doc in batadv_priv Simon Wunderlich
@ 2021-04-08 21:30 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-04-08 21:30 UTC (permalink / raw)
To: Simon Wunderlich; +Cc: kuba, davem, netdev, b.a.t.m.a.n, linus.luessing, sven
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/3] batman-adv: Drop unused header preempt.h
2021-04-08 11:53 [PATCH 0/3] pull request for net-next: batman-adv 2021-04-08 Simon Wunderlich
2021-04-08 11:53 ` [PATCH 1/3] batman-adv: Fix order of kernel doc in batadv_priv Simon Wunderlich
@ 2021-04-08 11:54 ` Simon Wunderlich
2021-04-08 11:54 ` [PATCH 3/3] batman-adv: Fix misspelled "wont" Simon Wunderlich
2 siblings, 0 replies; 5+ messages in thread
From: Simon Wunderlich @ 2021-04-08 11:54 UTC (permalink / raw)
To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Sven Eckelmann, Simon Wunderlich
From: Sven Eckelmann <sven@narfation.org>
The commit b1de0f01b011 ("batman-adv: Use netif_rx_any_context().") removed
the last user for a function declaration from linux/preempt.h. The include
should therefore be cleaned up.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
net/batman-adv/bridge_loop_avoidance.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index bcd543ce835b..7dc133cfc363 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -25,7 +25,6 @@
#include <linux/lockdep.h>
#include <linux/netdevice.h>
#include <linux/netlink.h>
-#include <linux/preempt.h>
#include <linux/rculist.h>
#include <linux/rcupdate.h>
#include <linux/skbuff.h>
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] batman-adv: Fix misspelled "wont"
2021-04-08 11:53 [PATCH 0/3] pull request for net-next: batman-adv 2021-04-08 Simon Wunderlich
2021-04-08 11:53 ` [PATCH 1/3] batman-adv: Fix order of kernel doc in batadv_priv Simon Wunderlich
2021-04-08 11:54 ` [PATCH 2/3] batman-adv: Drop unused header preempt.h Simon Wunderlich
@ 2021-04-08 11:54 ` Simon Wunderlich
2 siblings, 0 replies; 5+ messages in thread
From: Simon Wunderlich @ 2021-04-08 11:54 UTC (permalink / raw)
To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Sven Eckelmann, Simon Wunderlich
From: Sven Eckelmann <sven@narfation.org>
checkpatch started to complain about the mispelling of:
CHECK: 'wont' may be misspelled - perhaps 'won't'?
#459: FILE: ./net/batman-adv/bat_iv_ogm.c:459:
+ * - the resulting packet wont be bigger than
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
net/batman-adv/bat_iv_ogm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index a5e313cd6f44..789f257be24f 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -456,7 +456,7 @@ batadv_iv_ogm_can_aggregate(const struct batadv_ogm_packet *new_bat_ogm_packet,
* if:
*
* - the send time is within our MAX_AGGREGATION_MS time
- * - the resulting packet wont be bigger than
+ * - the resulting packet won't be bigger than
* MAX_AGGREGATION_BYTES
* otherwise aggregation is not possible
*/
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-04-08 21:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-08 11:53 [PATCH 0/3] pull request for net-next: batman-adv 2021-04-08 Simon Wunderlich
2021-04-08 11:53 ` [PATCH 1/3] batman-adv: Fix order of kernel doc in batadv_priv Simon Wunderlich
2021-04-08 21:30 ` patchwork-bot+netdevbpf
2021-04-08 11:54 ` [PATCH 2/3] batman-adv: Drop unused header preempt.h Simon Wunderlich
2021-04-08 11:54 ` [PATCH 3/3] batman-adv: Fix misspelled "wont" Simon Wunderlich
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).