Commit 6a63b015 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Simon Wunderlich says:

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

 - bump version strings, by Simon Wunderlich

 - constify and move broadcast addr definition, Matthias Schiffer

 - remove start/stop queue function for mesh-iface, by Antonio Quartulli

 - switch to crc32 header for crc32c, by Sven Eckelmann

 - drop unused net_namespace.h include, by Sven Eckelmann

* tag 'batadv-next-pullrequest-20250509' of git://git.open-mesh.org/linux-merge:
  batman-adv: Drop unused net_namespace.h include
  batman-adv: Switch to crc32 header for crc32c
  batman-adv: no need to start/stop queue on mesh-iface
  batman-adv: constify and move broadcast addr definition
  batman-adv: Start new development cycle
====================

Link: https://patch.msgid.link/20250509091041.108416-1-sw@simonwunderlich.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3c9ff6eb 4e1ccc8e

net/batman-adv/main.c

+1 −3
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include <linux/build_bug.h>

#include <linux/byteorder/generic.h>

#include <linux/container_of.h>

#include <linux/crc32c.h>

#include <linux/crc32.h>

#include <linux/device.h>

#include <linux/errno.h>

#include <linux/gfp.h>
@@ -69,8 +69,6 @@ unsigned int batadv_hardif_generation; 
static int (*batadv_rx_handler[256])(struct sk_buff *skb,

				     struct batadv_hard_iface *recv_if);



unsigned char batadv_broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};



struct workqueue_struct *batadv_event_workqueue;



static void batadv_recv_handler_init(void);

net/batman-adv/main.h

+1 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#define BATADV_DRIVER_DEVICE "batman-adv"



#ifndef BATADV_SOURCE_VERSION

#define BATADV_SOURCE_VERSION "2025.1"

#define BATADV_SOURCE_VERSION "2025.2"

#endif



/* B.A.T.M.A.N. parameters */
@@ -235,7 +235,6 @@ static inline int batadv_print_vid(unsigned short vid) 
extern struct list_head batadv_hardif_list;

extern unsigned int batadv_hardif_generation;



extern unsigned char batadv_broadcast_addr[];

extern struct workqueue_struct *batadv_event_workqueue;



int batadv_mesh_init(struct net_device *mesh_iface);

net/batman-adv/mesh-interface.c

+0 −15
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <linux/stddef.h>

#include <linux/string.h>

#include <linux/types.h>

#include <net/net_namespace.h>

#include <net/netlink.h>

#include <uapi/linux/batadv_packet.h>

#include <uapi/linux/batman_adv.h>
@@ -77,18 +76,6 @@ int batadv_skb_head_push(struct sk_buff *skb, unsigned int len) 
	return 0;

}



static int batadv_interface_open(struct net_device *dev)

{

	netif_start_queue(dev);

	return 0;

}



static int batadv_interface_release(struct net_device *dev)

{

	netif_stop_queue(dev);

	return 0;

}



/**

 * batadv_sum_counter() - Sum the cpu-local counters for index 'idx'

 * @bat_priv: the bat priv with all the mesh interface information
@@ -890,8 +877,6 @@ static int batadv_meshif_slave_del(struct net_device *dev, 


static const struct net_device_ops batadv_netdev_ops = {

	.ndo_init = batadv_meshif_init_late,

	.ndo_open = batadv_interface_open,

	.ndo_stop = batadv_interface_release,

	.ndo_get_stats = batadv_interface_stats,

	.ndo_vlan_rx_add_vid = batadv_interface_add_vid,

	.ndo_vlan_rx_kill_vid = batadv_interface_kill_vid,

net/batman-adv/send.c

+3 −1
Original line number Diff line number Diff line
@@ -124,7 +124,9 @@ int batadv_send_skb_packet(struct sk_buff *skb, 
int batadv_send_broadcast_skb(struct sk_buff *skb,

			      struct batadv_hard_iface *hard_iface)

{

	return batadv_send_skb_packet(skb, hard_iface, batadv_broadcast_addr);

	static const u8 broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};



	return batadv_send_skb_packet(skb, hard_iface, broadcast_addr);

}



/**

net/batman-adv/translation-table.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/cache.h>

#include <linux/compiler.h>

#include <linux/container_of.h>

#include <linux/crc32c.h>

#include <linux/crc32.h>

#include <linux/err.h>

#include <linux/errno.h>

#include <linux/etherdevice.h>