Commit 65dc5416 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batadv-next-for-davem-20190627v2' 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

 - fix includes for _MAX constants, atomic functions and fwdecls,
   by Sven Eckelmann (3 patches)

 - shorten multicast tt/tvlv worker spinlock section, by Linus Luessing

 - routeable multicast preparations: implement MAC multicast filtering,
   by Linus Luessing (2 patches, David Millers comments integrated)

 - remove return value checks for debugfs_create, by Greg Kroah-Hartman

 - add routable multicast optimizations, by Linus Luessing (2 patches)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fcd71efd 11d458c1

include/uapi/linux/batadv_packet.h

+8 −0
Original line number Diff line number Diff line
@@ -107,12 +107,20 @@ enum batadv_icmp_packettype { 
 * @BATADV_MCAST_WANT_ALL_UNSNOOPABLES: we want all packets destined for

 *  224.0.0.0/24 or ff02::1

 * @BATADV_MCAST_WANT_ALL_IPV4: we want all IPv4 multicast packets

 *  (both link-local and routable ones)

 * @BATADV_MCAST_WANT_ALL_IPV6: we want all IPv6 multicast packets

 *  (both link-local and routable ones)

 * @BATADV_MCAST_WANT_NO_RTR4: we have no IPv4 multicast router and therefore

 * only need routable IPv4 multicast packets we signed up for explicitly

 * @BATADV_MCAST_WANT_NO_RTR6: we have no IPv6 multicast router and therefore

 * only need routable IPv6 multicast packets we signed up for explicitly

 */

enum batadv_mcast_flags {

	BATADV_MCAST_WANT_ALL_UNSNOOPABLES	= 1UL << 0,

	BATADV_MCAST_WANT_ALL_IPV4		= 1UL << 1,

	BATADV_MCAST_WANT_ALL_IPV6		= 1UL << 2,

	BATADV_MCAST_WANT_NO_RTR4		= 1UL << 3,

	BATADV_MCAST_WANT_NO_RTR6		= 1UL << 4,

};



/* tt data subtypes */

net/batman-adv/bat_algo.h

+3 −4
Original line number Diff line number Diff line
@@ -9,12 +9,11 @@ 


#include "main.h"



#include <linux/netlink.h>

#include <linux/seq_file.h>

#include <linux/skbuff.h>

#include <linux/types.h>



struct netlink_callback;

struct seq_file;

struct sk_buff;



extern char batadv_routing_algo[];

extern struct list_head batadv_hardif_list;

net/batman-adv/bat_v.c

+1 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/rculist.h>

#include <linux/rcupdate.h>

#include <linux/seq_file.h>

#include <linux/skbuff.h>

#include <linux/spinlock.h>

#include <linux/stddef.h>

#include <linux/types.h>
@@ -41,8 +42,6 @@ 
#include "netlink.h"

#include "originator.h"



struct sk_buff;



static void batadv_v_iface_activate(struct batadv_hard_iface *hard_iface)

{

	struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);

net/batman-adv/bat_v_elp.h

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 


#include "main.h"



struct sk_buff;

struct work_struct;

#include <linux/skbuff.h>

#include <linux/workqueue.h>



int batadv_v_elp_iface_enable(struct batadv_hard_iface *hard_iface);

void batadv_v_elp_iface_disable(struct batadv_hard_iface *hard_iface);

net/batman-adv/bat_v_ogm.h

+1 −2
Original line number Diff line number Diff line
@@ -9,10 +9,9 @@ 


#include "main.h"



#include <linux/skbuff.h>

#include <linux/types.h>



struct sk_buff;



int batadv_v_ogm_init(struct batadv_priv *bat_priv);

void batadv_v_ogm_free(struct batadv_priv *bat_priv);

int batadv_v_ogm_iface_enable(struct batadv_hard_iface *hard_iface);

CRA Git | Maintained and supported by SUSTech CRA and CCSE