Commit 079f921e authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batadv-next-for-davem-20200824' of git://git.open-mesh.org/linux-merge 



Simon Wunderlich says:

====================
This cleanup patchset includes the following patches:

 - bump version strings, by Simon Wunderlich

 - Drop unused function batadv_hardif_remove_interfaces(),
   by Sven Eckelmann

 - delete duplicated words, by Randy Dunlap

 - Drop (even more) repeated words in comments, by Sven Eckelmann

 - Migrate to linux/prandom.h, by Sven Eckelmann
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 64d123fc 0093870a

net/batman-adv/bat_iv_ogm.c

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/netdevice.h>

#include <linux/netlink.h>

#include <linux/pkt_sched.h>

#include <linux/prandom.h>

#include <linux/printk.h>

#include <linux/random.h>

#include <linux/rculist.h>

net/batman-adv/bat_v_elp.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/kref.h>

#include <linux/netdevice.h>

#include <linux/nl80211.h>

#include <linux/prandom.h>

#include <linux/random.h>

#include <linux/rculist.h>

#include <linux/rcupdate.h>

net/batman-adv/bat_v_ogm.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/lockdep.h>

#include <linux/mutex.h>

#include <linux/netdevice.h>

#include <linux/prandom.h>

#include <linux/random.h>

#include <linux/rculist.h>

#include <linux/rcupdate.h>

net/batman-adv/bridge_loop_avoidance.c

+1 −1
Original line number Diff line number Diff line
@@ -1795,7 +1795,7 @@ batadv_bla_loopdetect_check(struct batadv_priv *bat_priv, struct sk_buff *skb, 


	ret = queue_work(batadv_event_workqueue, &backbone_gw->report_work);



	/* backbone_gw is unreferenced in the report work function function

	/* backbone_gw is unreferenced in the report work function

	 * if queue_work() call was successful

	 */

	if (!ret)

net/batman-adv/fragmentation.c

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ free: 
 * set *skb to merged packet; 2) Packet is buffered: Return true and set *skb

 * to NULL; 3) Error: Return false and free skb.

 *

 * Return: true when the packet is merged or buffered, false when skb is not not

 * Return: true when the packet is merged or buffered, false when skb is not

 * used.

 */

bool batadv_frag_skb_buffer(struct sk_buff **skb,

CRA Git | Maintained and supported by SUSTech CRA and CCSE