Merge tag 'batadv-next-pullrequest-20210408' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

====================
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
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index a5e313cd6f4475fec122da1cdeda7b925b05c0c9..789f257be24f36ace3e63628a3381a6d46dcccd9 100644 (file)
--- 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
         */

diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index bcd543ce835b49480613a24108eb6a2ba62657e5..7dc133cfc3637296471192c347d20d5d7b1c2b92 100644 (file)
--- 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>

diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index 7c0b475cc22a8ce8b22de75ebc946185d31ef0b9..2be5d4a712c5c2ddc4a04d7296a6d4e4b57a7478 100644 (file)
--- 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 */