Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77af7575 authored by Marek Lindner's avatar Marek Lindner Committed by Antonio Quartulli
Browse files

batman-adv: handle routing code initialization properly 



Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
Signed-off-by: default avatarAntonio Quartulli <ordex@autistici.org>
parent 00a50076

net/batman-adv/bat_iv_ogm.c

+10 −1
Original line number Diff line number Diff line
@@ -30,10 +30,11 @@ 
#include "send.h"

#include "bat_algo.h"



static void bat_iv_ogm_iface_enable(struct hard_iface *hard_iface)

static int bat_iv_ogm_iface_enable(struct hard_iface *hard_iface)

{

	struct batman_ogm_packet *batman_ogm_packet;

	uint32_t random_seqno;

	int res = -1;



	/* randomize initial seqno to avoid collision */

	get_random_bytes(&random_seqno, sizeof(random_seqno));
@@ -42,6 +43,9 @@ static void bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) 
	hard_iface->packet_len = BATMAN_OGM_LEN;

	hard_iface->packet_buff = kmalloc(hard_iface->packet_len, GFP_ATOMIC);



	if (!hard_iface->packet_buff)

		goto out;



	batman_ogm_packet = (struct batman_ogm_packet *)hard_iface->packet_buff;

	batman_ogm_packet->header.packet_type = BAT_OGM;

	batman_ogm_packet->header.version = COMPAT_VERSION;
@@ -50,6 +54,11 @@ static void bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) 
	batman_ogm_packet->tq = TQ_MAX_VALUE;

	batman_ogm_packet->tt_num_changes = 0;

	batman_ogm_packet->ttvn = 0;



	res = 0;



out:

	return res;

}



static void bat_iv_ogm_iface_disable(struct hard_iface *hard_iface)

net/batman-adv/hard-interface.c

+6 −9
Original line number Diff line number Diff line
@@ -304,22 +304,17 @@ int hardif_enable_interface(struct hard_iface *hard_iface, 
	if (!softif_is_valid(soft_iface)) {

		pr_err("Can't create batman mesh interface %s: already exists as regular interface\n",

		       soft_iface->name);

		dev_put(soft_iface);

		ret = -EINVAL;

		goto err;

		goto err_dev;

	}



	hard_iface->soft_iface = soft_iface;

	bat_priv = netdev_priv(hard_iface->soft_iface);



	bat_priv->bat_algo_ops->bat_iface_enable(hard_iface);



	if (!hard_iface->packet_buff) {

		bat_err(hard_iface->soft_iface,

			"Can't add interface packet (%s): out of memory\n",

			hard_iface->net_dev->name);

	ret = bat_priv->bat_algo_ops->bat_iface_enable(hard_iface);

	if (ret < 0) {

		ret = -ENOMEM;

		goto err;

		goto err_dev;

	}



	hard_iface->if_num = bat_priv->num_ifaces;
@@ -363,6 +358,8 @@ int hardif_enable_interface(struct hard_iface *hard_iface, 
out:

	return 0;



err_dev:

	dev_put(soft_iface);

err:

	hardif_free_ref(hard_iface);

	return ret;

net/batman-adv/types.h

+1 −1
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ struct bat_algo_ops { 
	struct hlist_node list;

	char *name;

	/* init routing info when hard-interface is enabled */

	void (*bat_iface_enable)(struct hard_iface *hard_iface);

	int (*bat_iface_enable)(struct hard_iface *hard_iface);

	/* de-init routing info when hard-interface is disabled */

	void (*bat_iface_disable)(struct hard_iface *hard_iface);

	/* init primary OGM when primary interface is selected */