Commit 5dd3beba authored by David S. Miller's avatar David S. Miller
Browse files

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



Simon Wunderlich says:

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

 - bump version strings, by Simon Wunderlich

 - drop prandom.h includes, by Sven Eckelmann

 - fix mailing list address, by Sven Eckelmann

 - multicast feature preparation, by Linus Lüssing (2 patches)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5c0862c2 0c4061c0

Documentation/networking/batman-adv.rst

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ Please send us comments, experiences, questions, anything :) 
IRC:

  #batadv on ircs://irc.hackint.org/

Mailing-list:

  b.a.t.m.a.n@open-mesh.org (optional subscription at

  b.a.t.m.a.n@lists.open-mesh.org (optional subscription at

  https://lists.open-mesh.org/mailman3/postorius/lists/b.a.t.m.a.n.lists.open-mesh.org/)



You can also contact the Authors:

include/uapi/linux/batadv_packet.h

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
 * @BATADV_CODED: network coded packets

 * @BATADV_ELP: echo location packets for B.A.T.M.A.N. V

 * @BATADV_OGM2: originator messages for B.A.T.M.A.N. V

 * @BATADV_MCAST: multicast packet with multiple destination addresses

 *

 * @BATADV_UNICAST: unicast packets carrying unicast payload traffic

 * @BATADV_UNICAST_FRAG: unicast packets carrying a fragment of the original
@@ -42,6 +43,7 @@ enum batadv_packettype { 
	BATADV_CODED            = 0x02,

	BATADV_ELP		= 0x03,

	BATADV_OGM2		= 0x04,

	BATADV_MCAST            = 0x05,

	/* 0x40 - 0x7f: unicast */

#define BATADV_UNICAST_MIN     0x40

	BATADV_UNICAST          = 0x40,

net/batman-adv/bat_iv_ogm.c

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

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/minmax.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

+2 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/minmax.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>
@@ -800,8 +799,8 @@ batadv_v_ogm_process_per_outif(struct batadv_priv *bat_priv, 


	/* only unknown & newer OGMs contain TVLVs we are interested in */

	if (seqno_age > 0 && if_outgoing == BATADV_IF_DEFAULT)

		batadv_tvlv_containers_process(bat_priv, true, orig_node,

					       NULL, NULL,

		batadv_tvlv_containers_process(bat_priv, BATADV_OGM2, orig_node,

					       NULL,

					       (unsigned char *)(ogm2 + 1),

					       ntohs(ogm2->tvlv_len));