Commit 59372af6 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Simon Wunderlich says:

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

 - bump version strings, by Simon Wunderlich

 - Reorder includes for distributed-arp-table.c, by Sven Eckelmann

 - Fix translation table change handling, by Remi Pommarel (2 patches)

 - Map VID 0 to untagged TT VLAN, by Sven Eckelmann

 - Update MAINTAINERS/mailmap e-mail addresses, by the respective authors
   (4 patches)

 - netlink: reduce duplicate code by returning interfaces,
   by Linus Lüssing

* tag 'batadv-next-pullrequest-20250117' of git://git.open-mesh.org/linux-merge:
  batman-adv: netlink: reduce duplicate code by returning interfaces
  MAINTAINERS: mailmap: add entries for Antonio Quartulli
  mailmap: add entries for Sven Eckelmann
  mailmap: add entries for Simon Wunderlich
  MAINTAINERS: update email address of Marek Linder
  batman-adv: Map VID 0 to untagged TT VLAN
  batman-adv: Don't keep redundant TT change events
  batman-adv: Remove atomic usage for tt.local_changes
  batman-adv: Reorder includes for distributed-arp-table.c
  batman-adv: Start new development cycle
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 1a280c54 6ecc4fd6

.mailmap

+19 −0
Original line number Diff line number Diff line
@@ -83,6 +83,13 @@ Anirudh Ghayal <quic_aghayal@quicinc.com> <aghayal@codeaurora.org> 
Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com>

Antoine Tenart <atenart@kernel.org> <antoine.tenart@free-electrons.com>

Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>

Antonio Quartulli <antonio@mandelbit.com> <antonio@meshcoding.com>

Antonio Quartulli <antonio@mandelbit.com> <antonio@open-mesh.com>

Antonio Quartulli <antonio@mandelbit.com> <antonio.quartulli@open-mesh.com>

Antonio Quartulli <antonio@mandelbit.com> <ordex@autistici.org>

Antonio Quartulli <antonio@mandelbit.com> <ordex@ritirata.org>

Antonio Quartulli <antonio@mandelbit.com> <antonio@openvpn.net>

Antonio Quartulli <antonio@mandelbit.com> <a@unstable.cc>

Anup Patel <anup@brainfault.org> <anup.patel@wdc.com>

Archit Taneja <archit@ti.com>

Ard Biesheuvel <ardb@kernel.org> <ard.biesheuvel@linaro.org>
@@ -429,6 +436,8 @@ Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com> 
Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>

Marek Behún <kabel@kernel.org> <marek.behun@nic.cz>

Marek Behún <kabel@kernel.org> Marek Behun <marek.behun@nic.cz>

Marek Lindner <marek.lindner@mailbox.org> <lindner_marek@yahoo.de>

Marek Lindner <marek.lindner@mailbox.org> <mareklindner@neomailbox.ch>

Mark Brown <broonie@sirena.org.uk>

Mark Starovoytov <mstarovo@pm.me> <mstarovoitov@marvell.com>

Markus Schneider-Pargmann <msp@baylibre.com> <mpa@pengutronix.de>
@@ -644,6 +653,11 @@ Simona Vetter <simona.vetter@ffwll.ch> <daniel@biene.ffwll.ch> 
Simon Horman <horms@kernel.org> <simon.horman@corigine.com>

Simon Horman <horms@kernel.org> <simon.horman@netronome.com>

Simon Kelley <simon@thekelleys.org.uk>

Simon Wunderlich <sw@simonwunderlich.de> <simon.wunderlich@open-mesh.com>

Simon Wunderlich <sw@simonwunderlich.de> <simon.wunderlich@s2003.tu-chemnitz.de>

Simon Wunderlich <sw@simonwunderlich.de> <simon.wunderlich@saxnet.de>

Simon Wunderlich <sw@simonwunderlich.de> <simon@open-mesh.com>

Simon Wunderlich <sw@simonwunderlich.de> <siwu@hrz.tu-chemnitz.de>

Sricharan Ramabadhran <quic_srichara@quicinc.com> <sricharan@codeaurora.org>

Srinivas Ramana <quic_sramana@quicinc.com> <sramana@codeaurora.org>

Sriram R <quic_srirrama@quicinc.com> <srirrama@codeaurora.org>
@@ -664,6 +678,11 @@ Sudarshan Rajagopalan <quic_sudaraja@quicinc.com> <sudaraja@codeaurora.org> 
Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>

Sumit Semwal <sumit.semwal@ti.com>

Surabhi Vishnoi <quic_svishnoi@quicinc.com> <svishnoi@codeaurora.org>

Sven Eckelmann <sven@narfation.org> <seckelmann@datto.com>

Sven Eckelmann <sven@narfation.org> <sven.eckelmann@gmx.de>

Sven Eckelmann <sven@narfation.org> <sven.eckelmann@open-mesh.com>

Sven Eckelmann <sven@narfation.org> <sven.eckelmann@openmesh.com>

Sven Eckelmann <sven@narfation.org> <sven@open-mesh.com>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Tamizh Chelvam Raja <quic_tamizhr@quicinc.com> <tamizhr@codeaurora.org>

Taniya Das <quic_tdas@quicinc.com> <tdas@codeaurora.org>

Documentation/networking/batman-adv.rst

+1 −1
Original line number Diff line number Diff line
@@ -164,5 +164,5 @@ Mailing-list: 


You can also contact the Authors:



* Marek Lindner <mareklindner@neomailbox.ch>

* Marek Lindner <marek.lindner@mailbox.org>

* Simon Wunderlich <sw@simonwunderlich.de>

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -3874,9 +3874,9 @@ S: Maintained 
F:	drivers/platform/x86/barco-p50-gpio.c









BATMAN ADVANCED









M:	Marek Lindner <mareklindner@neomailbox.ch>









M:	Marek Lindner <marek.lindner@mailbox.org>









M:	Simon Wunderlich <sw@simonwunderlich.de>









M:	Antonio Quartulli <a@unstable.cc>









M:	Antonio Quartulli <antonio@mandelbit.com>









M:	Sven Eckelmann <sven@narfation.org>









L:	b.a.t.m.a.n@lists.open-mesh.org (moderated for non-subscribers)









S:	Maintained
































net/batman-adv/bridge_loop_avoidance.c



+7
−26






























Original line number
Diff line number
Diff line







@@ -12,6 +12,7 @@







#include <linux/compiler.h>









#include <linux/container_of.h>









#include <linux/crc16.h>









#include <linux/err.h>









#include <linux/errno.h>









#include <linux/etherdevice.h>









#include <linux/gfp.h>








@@ -38,7 +39,6 @@







#include <net/arp.h>









#include <net/genetlink.h>









#include <net/netlink.h>









#include <net/sock.h>









#include <uapi/linux/batadv_packet.h>









#include <uapi/linux/batman_adv.h>


















@@ -47,7 +47,6 @@







#include "log.h"









#include "netlink.h"









#include "originator.h"









#include "soft-interface.h"









#include "translation-table.h"



















static const u8 batadv_announce_mac[4] = {0x43, 0x05, 0x43, 0x05};








@@ -2233,25 +2232,16 @@ int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb)







{









	struct batadv_hard_iface *primary_if = NULL;









	int portid = NETLINK_CB(cb->skb).portid;









	struct net *net = sock_net(cb->skb->sk);









	struct net_device *soft_iface;









	struct batadv_hashtable *hash;









	struct batadv_priv *bat_priv;









	int bucket = cb->args[0];









	int idx = cb->args[1];









	int ifindex;









	int ret = 0;



















	ifindex = batadv_netlink_get_ifindex(cb->nlh,









					     BATADV_ATTR_MESH_IFINDEX);









	if (!ifindex)









		return -EINVAL;



















	soft_iface = dev_get_by_index(net, ifindex);









	if (!soft_iface || !batadv_softif_is_valid(soft_iface)) {









		ret = -ENODEV;









		goto out;









	}









	soft_iface = batadv_netlink_get_softif(cb);









	if (IS_ERR(soft_iface))









		return PTR_ERR(soft_iface);



















	bat_priv = netdev_priv(soft_iface);









	hash = bat_priv->bla.claim_hash;








@@ -2403,25 +2393,16 @@ int batadv_bla_backbone_dump(struct sk_buff *msg, struct netlink_callback *cb)







{









	struct batadv_hard_iface *primary_if = NULL;









	int portid = NETLINK_CB(cb->skb).portid;









	struct net *net = sock_net(cb->skb->sk);









	struct net_device *soft_iface;









	struct batadv_hashtable *hash;









	struct batadv_priv *bat_priv;









	int bucket = cb->args[0];









	int idx = cb->args[1];









	int ifindex;









	int ret = 0;



















	ifindex = batadv_netlink_get_ifindex(cb->nlh,









					     BATADV_ATTR_MESH_IFINDEX);









	if (!ifindex)









		return -EINVAL;



















	soft_iface = dev_get_by_index(net, ifindex);









	if (!soft_iface || !batadv_softif_is_valid(soft_iface)) {









		ret = -ENODEV;









		goto out;









	}









	soft_iface = batadv_netlink_get_softif(cb);









	if (IS_ERR(soft_iface))









		return PTR_ERR(soft_iface);



















	bat_priv = netdev_priv(soft_iface);









	hash = bat_priv->bla.backbone_hash;
































net/batman-adv/distributed-arp-table.c



+5
−15






























Original line number
Diff line number
Diff line







@@ -7,11 +7,11 @@







#include "distributed-arp-table.h"









#include "main.h"



















#include <linux/unaligned.h>









#include <linux/atomic.h>









#include <linux/bitops.h>









#include <linux/byteorder/generic.h>









#include <linux/container_of.h>









#include <linux/err.h>









#include <linux/errno.h>









#include <linux/etherdevice.h>









#include <linux/gfp.h>








@@ -32,11 +32,11 @@







#include <linux/stddef.h>









#include <linux/string.h>









#include <linux/udp.h>









#include <linux/unaligned.h>









#include <linux/workqueue.h>









#include <net/arp.h>









#include <net/genetlink.h>









#include <net/netlink.h>









#include <net/sock.h>









#include <uapi/linux/batman_adv.h>



















#include "bridge_loop_avoidance.h"








@@ -46,7 +46,6 @@







#include "netlink.h"









#include "originator.h"









#include "send.h"









#include "soft-interface.h"









#include "translation-table.h"









#include "tvlv.h"


















@@ -937,25 +936,16 @@ int batadv_dat_cache_dump(struct sk_buff *msg, struct netlink_callback *cb)







{









	struct batadv_hard_iface *primary_if = NULL;









	int portid = NETLINK_CB(cb->skb).portid;









	struct net *net = sock_net(cb->skb->sk);









	struct net_device *soft_iface;









	struct batadv_hashtable *hash;









	struct batadv_priv *bat_priv;









	int bucket = cb->args[0];









	int idx = cb->args[1];









	int ifindex;









	int ret = 0;



















	ifindex = batadv_netlink_get_ifindex(cb->nlh,









					     BATADV_ATTR_MESH_IFINDEX);









	if (!ifindex)









		return -EINVAL;



















	soft_iface = dev_get_by_index(net, ifindex);









	if (!soft_iface || !batadv_softif_is_valid(soft_iface)) {









		ret = -ENODEV;









		goto out;









	}









	soft_iface = batadv_netlink_get_softif(cb);









	if (IS_ERR(soft_iface))









		return PTR_ERR(soft_iface);



















	bat_priv = netdev_priv(soft_iface);









	hash = bat_priv->dat.hash;