Commit 4667bf71 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents c5f77ad8 35796c1d

net/batman-adv/bat_iv_ogm.c

+1 −1
Original line number Diff line number Diff line
@@ -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

	 */

net/batman-adv/bridge_loop_avoidance.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

net/batman-adv/types.h

+5 −5
Original line number Diff line number Diff line
@@ -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 */