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

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



Simon Wunderlich says:

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

 - bump version strings, by Simon Wunderlich

 - Improve error handling in DAT and uevent generator,
   by Markus Elfring (2 patches)

 - Drop usage of export.h, by Sven Eckelmann
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 20ea9327 db60ad8b

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

+1 −2
Original line number Diff line number Diff line
@@ -684,7 +684,7 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv, 


	cand = batadv_dat_select_candidates(bat_priv, ip, vid);

	if (!cand)

		goto out;

		return ret;



	batadv_dbg(BATADV_DBG_DAT, bat_priv, "DHT_SEND for %pI4\n", &ip);
@@ -728,7 +728,6 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv, 
		batadv_orig_node_put(cand[i].orig_node);

	}



out:

	kfree(cand);

	return ret;

}

net/batman-adv/main.c

+8 −6
Original line number Diff line number Diff line
@@ -691,29 +691,31 @@ int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type, 
				  "%s%s", BATADV_UEV_TYPE_VAR,

				  batadv_uev_type_str[type]);

	if (!uevent_env[0])

		goto out;

		goto report_error;



	uevent_env[1] = kasprintf(GFP_ATOMIC,

				  "%s%s", BATADV_UEV_ACTION_VAR,

				  batadv_uev_action_str[action]);

	if (!uevent_env[1])

		goto out;

		goto free_first_env;



	/* If the event is DEL, ignore the data field */

	if (action != BATADV_UEV_DEL) {

		uevent_env[2] = kasprintf(GFP_ATOMIC,

					  "%s%s", BATADV_UEV_DATA_VAR, data);

		if (!uevent_env[2])

			goto out;

			goto free_second_env;

	}



	ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env);

out:

	kfree(uevent_env[0]);

	kfree(uevent_env[1]);

	kfree(uevent_env[2]);

free_second_env:

	kfree(uevent_env[1]);

free_first_env:

	kfree(uevent_env[0]);



	if (ret)

report_error:

		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

			   "Impossible to send uevent for (%s,%s,%s) event (err: %d)\n",

			   batadv_uev_type_str[type],

net/batman-adv/main.h

+1 −1
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 "2024.0"

#define BATADV_SOURCE_VERSION "2024.1"

#endif



/* B.A.T.M.A.N. parameters */

net/batman-adv/netlink.c

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

#include <linux/err.h>

#include <linux/errno.h>

#include <linux/export.h>

#include <linux/genetlink.h>

#include <linux/gfp.h>

#include <linux/if_ether.h>