Commit a52f9f0d authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Simon Wunderlich says:

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

 - bump version strings, by Simon Wunderlich

 - batman-adv: store hard_iface as iflink private data,
   by Matthias Schiffer

* tag 'batadv-next-pullrequest-20250710' of git://git.open-mesh.org/linux-merge:
  batman-adv: store hard_iface as iflink private data
  batman-adv: Start new development cycle
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 19d181d8 7dc28470

net/batman-adv/bat_algo.c

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

#include <linux/stddef.h>

#include <linux/string.h>

#include <linux/types.h>

#include <net/genetlink.h>

#include <net/netlink.h>

#include <uapi/linux/batman_adv.h>

net/batman-adv/bat_algo.h

+0 −2
Original line number Diff line number Diff line
@@ -11,10 +11,8 @@ 


#include <linux/netlink.h>

#include <linux/skbuff.h>

#include <linux/types.h>



extern char batadv_routing_algo[];

extern struct list_head batadv_hardif_list;



void batadv_algo_init(void);

struct batadv_algo_ops *batadv_algo_get(const char *name);

net/batman-adv/bat_iv_ogm.c

+8 −17
Original line number Diff line number Diff line
@@ -791,6 +791,7 @@ static void batadv_iv_ogm_schedule_buff(struct batadv_hard_iface *hard_iface) 
	struct batadv_ogm_packet *batadv_ogm_packet;

	struct batadv_hard_iface *primary_if, *tmp_hard_iface;

	int *ogm_buff_len = &hard_iface->bat_iv.ogm_buff_len;

	struct list_head *iter;

	u32 seqno;

	u16 tvlv_len = 0;

	unsigned long send_time;
@@ -847,10 +848,7 @@ static void batadv_iv_ogm_schedule_buff(struct batadv_hard_iface *hard_iface) 
	 * interfaces.

	 */

	rcu_read_lock();

	list_for_each_entry_rcu(tmp_hard_iface, &batadv_hardif_list, list) {

		if (tmp_hard_iface->mesh_iface != hard_iface->mesh_iface)

			continue;



	netdev_for_each_lower_private_rcu(hard_iface->mesh_iface, tmp_hard_iface, iter) {

		if (!kref_get_unless_zero(&tmp_hard_iface->refcount))

			continue;
@@ -1567,6 +1565,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset, 
	bool is_my_oldorig = false;

	bool is_my_addr = false;

	bool is_my_orig = false;

	struct list_head *iter;



	ogm_packet = (struct batadv_ogm_packet *)(skb->data + ogm_offset);

	ethhdr = eth_hdr(skb);
@@ -1603,11 +1602,9 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset, 
		   ogm_packet->version, has_directlink_flag);



	rcu_read_lock();

	list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {

		if (hard_iface->if_status != BATADV_IF_ACTIVE)

			continue;



		if (hard_iface->mesh_iface != if_incoming->mesh_iface)

	netdev_for_each_lower_private_rcu(if_incoming->mesh_iface, hard_iface, iter) {

		if (hard_iface->if_status != BATADV_IF_ACTIVE)

			continue;



		if (batadv_compare_eth(ethhdr->h_source,
@@ -1668,13 +1665,10 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset, 
					if_incoming, BATADV_IF_DEFAULT);



	rcu_read_lock();

	list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {

	netdev_for_each_lower_private_rcu(bat_priv->mesh_iface, hard_iface, iter) {

		if (hard_iface->if_status != BATADV_IF_ACTIVE)

			continue;



		if (hard_iface->mesh_iface != bat_priv->mesh_iface)

			continue;



		if (!kref_get_unless_zero(&hard_iface->refcount))

			continue;
@@ -2142,6 +2136,7 @@ batadv_iv_ogm_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb, 
			 struct batadv_hard_iface *single_hardif)

{

	struct batadv_hard_iface *hard_iface;

	struct list_head *iter;

	int i_hardif = 0;

	int i_hardif_s = cb->args[0];

	int idx = cb->args[1];
@@ -2158,11 +2153,7 @@ batadv_iv_ogm_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb, 
				i_hardif++;

		}

	} else {

		list_for_each_entry_rcu(hard_iface, &batadv_hardif_list,

					list) {

			if (hard_iface->mesh_iface != bat_priv->mesh_iface)

				continue;



		netdev_for_each_lower_private_rcu(bat_priv->mesh_iface, hard_iface, iter) {

			if (i_hardif++ < i_hardif_s)

				continue;

net/batman-adv/bat_v.c

+2 −4
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ batadv_v_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb, 
		    struct batadv_hard_iface *single_hardif)

{

	struct batadv_hard_iface *hard_iface;

	struct list_head *iter;

	int i_hardif = 0;

	int i_hardif_s = cb->args[0];

	int idx = cb->args[1];
@@ -227,10 +228,7 @@ batadv_v_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb, 
				i_hardif++;

		}

	} else {

		list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {

			if (hard_iface->mesh_iface != bat_priv->mesh_iface)

				continue;



		netdev_for_each_lower_private_rcu(bat_priv->mesh_iface, hard_iface, iter) {

			if (i_hardif++ < i_hardif_s)

				continue;

net/batman-adv/bat_v_elp.c

+2 −6
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <net/cfg80211.h>

#include <uapi/linux/batadv_packet.h>



#include "bat_algo.h"

#include "bat_v_ogm.h"

#include "hard-interface.h"

#include "log.h"
@@ -472,15 +471,12 @@ void batadv_v_elp_iface_activate(struct batadv_hard_iface *primary_iface, 
void batadv_v_elp_primary_iface_set(struct batadv_hard_iface *primary_iface)

{

	struct batadv_hard_iface *hard_iface;

	struct list_head *iter;



	/* update orig field of every elp iface belonging to this mesh */

	rcu_read_lock();

	list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {

		if (primary_iface->mesh_iface != hard_iface->mesh_iface)

			continue;



	netdev_for_each_lower_private_rcu(primary_iface->mesh_iface, hard_iface, iter)

		batadv_v_elp_iface_activate(primary_iface, hard_iface);

	}

	rcu_read_unlock();

}