batman-adv: Prefix bat_iv_ogm local static functions with batadv_ (fe8bc396) · Commits · e / devices / android_kernel_teracube_2e

net/batman-adv/bat_iv_ogm.c

+130 −127

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,7 @@
	#include "send.h"		#include "send.h"
	#include "bat_algo.h"		#include "bat_algo.h"

	static struct neigh_node bat_iv_ogm_neigh_new(struct hard_iface hard_iface,		static struct neigh_node batadv_iv_ogm_neigh_new(struct hard_iface hard_iface,
	const uint8_t *neigh_addr,		const uint8_t *neigh_addr,
	struct orig_node *orig_node,		struct orig_node *orig_node,
	struct orig_node *orig_neigh,		struct orig_node *orig_neigh,
	@@ -54,7 +54,7 @@ static struct neigh_node bat_iv_ogm_neigh_new(struct hard_iface hard_iface,
	return neigh_node;		return neigh_node;
	}		}

	static int bat_iv_ogm_iface_enable(struct hard_iface *hard_iface)		static int batadv_iv_ogm_iface_enable(struct hard_iface *hard_iface)
	{		{
	struct batman_ogm_packet *batman_ogm_packet;		struct batman_ogm_packet *batman_ogm_packet;
	uint32_t random_seqno;		uint32_t random_seqno;
	@@ -85,13 +85,13 @@ static int bat_iv_ogm_iface_enable(struct hard_iface *hard_iface)
	return res;		return res;
	}		}

	static void bat_iv_ogm_iface_disable(struct hard_iface *hard_iface)		static void batadv_iv_ogm_iface_disable(struct hard_iface *hard_iface)
	{		{
	kfree(hard_iface->packet_buff);		kfree(hard_iface->packet_buff);
	hard_iface->packet_buff = NULL;		hard_iface->packet_buff = NULL;
	}		}

	static void bat_iv_ogm_iface_update_mac(struct hard_iface *hard_iface)		static void batadv_iv_ogm_iface_update_mac(struct hard_iface *hard_iface)
	{		{
	struct batman_ogm_packet *batman_ogm_packet;		struct batman_ogm_packet *batman_ogm_packet;

	@@ -102,7 +102,7 @@ static void bat_iv_ogm_iface_update_mac(struct hard_iface *hard_iface)
	hard_iface->net_dev->dev_addr, ETH_ALEN);		hard_iface->net_dev->dev_addr, ETH_ALEN);
	}		}

	static void bat_iv_ogm_primary_iface_set(struct hard_iface *hard_iface)		static void batadv_iv_ogm_primary_iface_set(struct hard_iface *hard_iface)
	{		{
	struct batman_ogm_packet *batman_ogm_packet;		struct batman_ogm_packet *batman_ogm_packet;

	@@ -112,7 +112,8 @@ static void bat_iv_ogm_primary_iface_set(struct hard_iface *hard_iface)
	}		}

	/* when do we schedule our own ogm to be sent */		/* when do we schedule our own ogm to be sent */
	static unsigned long bat_iv_ogm_emit_send_time(const struct bat_priv *bat_priv)		static unsigned long
			batadv_iv_ogm_emit_send_time(const struct bat_priv *bat_priv)
	{		{
	return jiffies + msecs_to_jiffies(		return jiffies + msecs_to_jiffies(
	atomic_read(&bat_priv->orig_interval) -		atomic_read(&bat_priv->orig_interval) -
	@@ -120,20 +121,20 @@ static unsigned long bat_iv_ogm_emit_send_time(const struct bat_priv *bat_priv)
	}		}

	/* when do we schedule a ogm packet to be sent */		/* when do we schedule a ogm packet to be sent */
	static unsigned long bat_iv_ogm_fwd_send_time(void)		static unsigned long batadv_iv_ogm_fwd_send_time(void)
	{		{
	return jiffies + msecs_to_jiffies(random32() % (JITTER/2));		return jiffies + msecs_to_jiffies(random32() % (JITTER/2));
	}		}

	/* apply hop penalty for a normal link */		/* apply hop penalty for a normal link */
	static uint8_t hop_penalty(uint8_t tq, const struct bat_priv *bat_priv)		static uint8_t batadv_hop_penalty(uint8_t tq, const struct bat_priv *bat_priv)
	{		{
	int hop_penalty = atomic_read(&bat_priv->hop_penalty);		int hop_penalty = atomic_read(&bat_priv->hop_penalty);
	return (tq * (TQ_MAX_VALUE - hop_penalty)) / (TQ_MAX_VALUE);		return (tq * (TQ_MAX_VALUE - hop_penalty)) / (TQ_MAX_VALUE);
	}		}

	/* is there another aggregated packet here? */		/* is there another aggregated packet here? */
	static int bat_iv_ogm_aggr_packet(int buff_pos, int packet_len,		static int batadv_iv_ogm_aggr_packet(int buff_pos, int packet_len,
	int tt_num_changes)		int tt_num_changes)
	{		{
	int next_buff_pos = 0;		int next_buff_pos = 0;
	@@ -146,7 +147,7 @@ static int bat_iv_ogm_aggr_packet(int buff_pos, int packet_len,
	}		}

	/* send a batman ogm to a given interface */		/* send a batman ogm to a given interface */
	static void bat_iv_ogm_send_to_if(struct forw_packet *forw_packet,		static void batadv_iv_ogm_send_to_if(struct forw_packet *forw_packet,
	struct hard_iface *hard_iface)		struct hard_iface *hard_iface)
	{		{
	struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface);		struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
	@@ -164,7 +165,7 @@ static void bat_iv_ogm_send_to_if(struct forw_packet *forw_packet,
	batman_ogm_packet = (struct batman_ogm_packet *)forw_packet->skb->data;		batman_ogm_packet = (struct batman_ogm_packet *)forw_packet->skb->data;

	/* adjust all flags and log packets */		/* adjust all flags and log packets */
	while (bat_iv_ogm_aggr_packet(buff_pos, forw_packet->packet_len,		while (batadv_iv_ogm_aggr_packet(buff_pos, forw_packet->packet_len,
	batman_ogm_packet->tt_num_changes)) {		batman_ogm_packet->tt_num_changes)) {

	/* we might have aggregated direct link packets with an		/* we might have aggregated direct link packets with an
	@@ -208,7 +209,7 @@ static void bat_iv_ogm_send_to_if(struct forw_packet *forw_packet,
	}		}

	/* send a batman ogm packet */		/* send a batman ogm packet */
	static void bat_iv_ogm_emit(struct forw_packet *forw_packet)		static void batadv_iv_ogm_emit(struct forw_packet *forw_packet)
	{		{
	struct hard_iface *hard_iface;		struct hard_iface *hard_iface;
	struct net_device *soft_iface;		struct net_device *soft_iface;
	@@ -267,7 +268,7 @@ static void bat_iv_ogm_emit(struct forw_packet *forw_packet)
	if (hard_iface->soft_iface != soft_iface)		if (hard_iface->soft_iface != soft_iface)
	continue;		continue;

	bat_iv_ogm_send_to_if(forw_packet, hard_iface);		batadv_iv_ogm_send_to_if(forw_packet, hard_iface);
	}		}
	rcu_read_unlock();		rcu_read_unlock();

	@@ -277,8 +278,8 @@ static void bat_iv_ogm_emit(struct forw_packet *forw_packet)
	}		}

	/* return true if new_packet can be aggregated with forw_packet */		/* return true if new_packet can be aggregated with forw_packet */
	static bool bat_iv_ogm_can_aggregate(const struct batman_ogm_packet		static bool
	*new_batman_ogm_packet,		batadv_iv_ogm_can_aggregate(const struct batman_ogm_packet *new_bat_ogm_packet,
	struct bat_priv *bat_priv,		struct bat_priv *bat_priv,
	int packet_len, unsigned long send_time,		int packet_len, unsigned long send_time,
	bool directlink,		bool directlink,
	@@ -335,7 +336,7 @@ static bool bat_iv_ogm_can_aggregate(const struct batman_ogm_packet
	* interface only - we still can aggregate		* interface only - we still can aggregate
	*/		*/
	if ((directlink) &&		if ((directlink) &&
	(new_batman_ogm_packet->header.ttl == 1) &&		(new_bat_ogm_packet->header.ttl == 1) &&
	(forw_packet->if_incoming == if_incoming) &&		(forw_packet->if_incoming == if_incoming) &&

	/* packets from direct neighbors or		/* packets from direct neighbors or
	@@ -357,7 +358,7 @@ static bool bat_iv_ogm_can_aggregate(const struct batman_ogm_packet
	}		}

	/* create a new aggregated packet and add this packet to it */		/* create a new aggregated packet and add this packet to it */
	static void bat_iv_ogm_aggregate_new(const unsigned char *packet_buff,		static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff,
	int packet_len, unsigned long send_time,		int packet_len, unsigned long send_time,
	bool direct_link,		bool direct_link,
	struct hard_iface *if_incoming,		struct hard_iface *if_incoming,
	@@ -435,7 +436,7 @@ static void bat_iv_ogm_aggregate_new(const unsigned char *packet_buff,
	}		}

	/* aggregate a new packet into the existing ogm packet */		/* aggregate a new packet into the existing ogm packet */
	static void bat_iv_ogm_aggregate(struct forw_packet *forw_packet_aggr,		static void batadv_iv_ogm_aggregate(struct forw_packet *forw_packet_aggr,
	const unsigned char *packet_buff,		const unsigned char *packet_buff,
	int packet_len, bool direct_link)		int packet_len, bool direct_link)
	{		{
	@@ -452,9 +453,10 @@ static void bat_iv_ogm_aggregate(struct forw_packet *forw_packet_aggr,
	(1 << forw_packet_aggr->num_packets);		(1 << forw_packet_aggr->num_packets);
	}		}

	static void bat_iv_ogm_queue_add(struct bat_priv *bat_priv,		static void batadv_iv_ogm_queue_add(struct bat_priv *bat_priv,
	unsigned char *packet_buff,		unsigned char *packet_buff,
	int packet_len, struct hard_iface *if_incoming,		int packet_len,
			struct hard_iface *if_incoming,
	int own_packet, unsigned long send_time)		int own_packet, unsigned long send_time)
	{		{
	/* _aggr -> pointer to the packet we want to aggregate with		/* _aggr -> pointer to the packet we want to aggregate with
	@@ -474,7 +476,7 @@ static void bat_iv_ogm_queue_add(struct bat_priv *bat_priv,
	if ((atomic_read(&bat_priv->aggregated_ogms)) && (!own_packet)) {		if ((atomic_read(&bat_priv->aggregated_ogms)) && (!own_packet)) {
	hlist_for_each_entry(forw_packet_pos, tmp_node,		hlist_for_each_entry(forw_packet_pos, tmp_node,
	&bat_priv->forw_bat_list, list) {		&bat_priv->forw_bat_list, list) {
	if (bat_iv_ogm_can_aggregate(batman_ogm_packet,		if (batadv_iv_ogm_can_aggregate(batman_ogm_packet,
	bat_priv, packet_len,		bat_priv, packet_len,
	send_time, direct_link,		send_time, direct_link,
	if_incoming,		if_incoming,
	@@ -500,17 +502,17 @@ static void bat_iv_ogm_queue_add(struct bat_priv *bat_priv,
	(atomic_read(&bat_priv->aggregated_ogms)))		(atomic_read(&bat_priv->aggregated_ogms)))
	send_time += msecs_to_jiffies(MAX_AGGREGATION_MS);		send_time += msecs_to_jiffies(MAX_AGGREGATION_MS);

	bat_iv_ogm_aggregate_new(packet_buff, packet_len,		batadv_iv_ogm_aggregate_new(packet_buff, packet_len,
	send_time, direct_link,		send_time, direct_link,
	if_incoming, own_packet);		if_incoming, own_packet);
	} else {		} else {
	bat_iv_ogm_aggregate(forw_packet_aggr, packet_buff,		batadv_iv_ogm_aggregate(forw_packet_aggr, packet_buff,
	packet_len, direct_link);		packet_len, direct_link);
	spin_unlock_bh(&bat_priv->forw_bat_list_lock);		spin_unlock_bh(&bat_priv->forw_bat_list_lock);
	}		}
	}		}

	static void bat_iv_ogm_forward(struct orig_node *orig_node,		static void batadv_iv_ogm_forward(struct orig_node *orig_node,
	const struct ethhdr *ethhdr,		const struct ethhdr *ethhdr,
	struct batman_ogm_packet *batman_ogm_packet,		struct batman_ogm_packet *batman_ogm_packet,
	bool is_single_hop_neigh,		bool is_single_hop_neigh,
	@@ -544,7 +546,8 @@ static void bat_iv_ogm_forward(struct orig_node *orig_node,
	memcpy(batman_ogm_packet->prev_sender, ethhdr->h_source, ETH_ALEN);		memcpy(batman_ogm_packet->prev_sender, ethhdr->h_source, ETH_ALEN);

	/* apply hop penalty */		/* apply hop penalty */
	batman_ogm_packet->tq = hop_penalty(batman_ogm_packet->tq, bat_priv);		batman_ogm_packet->tq = batadv_hop_penalty(batman_ogm_packet->tq,
			bat_priv);

	batadv_dbg(DBG_BATMAN, bat_priv,		batadv_dbg(DBG_BATMAN, bat_priv,
	"Forwarding packet: tq: %i, ttl: %i\n",		"Forwarding packet: tq: %i, ttl: %i\n",
	@@ -557,12 +560,12 @@ static void bat_iv_ogm_forward(struct orig_node *orig_node,
	else		else
	batman_ogm_packet->flags &= ~DIRECTLINK;		batman_ogm_packet->flags &= ~DIRECTLINK;

	bat_iv_ogm_queue_add(bat_priv, (unsigned char *)batman_ogm_packet,		batadv_iv_ogm_queue_add(bat_priv, (unsigned char *)batman_ogm_packet,
	BATMAN_OGM_HLEN + batadv_tt_len(tt_num_changes),		BATMAN_OGM_HLEN + batadv_tt_len(tt_num_changes),
	if_incoming, 0, bat_iv_ogm_fwd_send_time());		if_incoming, 0, batadv_iv_ogm_fwd_send_time());
	}		}

	static void bat_iv_ogm_schedule(struct hard_iface *hard_iface)		static void batadv_iv_ogm_schedule(struct hard_iface *hard_iface)
	{		{
	struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface);		struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
	struct batman_ogm_packet *batman_ogm_packet;		struct batman_ogm_packet *batman_ogm_packet;
	@@ -603,19 +606,19 @@ static void bat_iv_ogm_schedule(struct hard_iface *hard_iface)
	batman_ogm_packet->gw_flags = NO_FLAGS;		batman_ogm_packet->gw_flags = NO_FLAGS;

	batadv_slide_own_bcast_window(hard_iface);		batadv_slide_own_bcast_window(hard_iface);
	bat_iv_ogm_queue_add(bat_priv, hard_iface->packet_buff,		batadv_iv_ogm_queue_add(bat_priv, hard_iface->packet_buff,
	hard_iface->packet_len, hard_iface, 1,		hard_iface->packet_len, hard_iface, 1,
	bat_iv_ogm_emit_send_time(bat_priv));		batadv_iv_ogm_emit_send_time(bat_priv));

	if (primary_if)		if (primary_if)
	batadv_hardif_free_ref(primary_if);		batadv_hardif_free_ref(primary_if);
	}		}

	static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv,		static void
			batadv_iv_ogm_orig_update(struct bat_priv *bat_priv,
	struct orig_node *orig_node,		struct orig_node *orig_node,
	const struct ethhdr *ethhdr,		const struct ethhdr *ethhdr,
	const struct batman_ogm_packet		const struct batman_ogm_packet *batman_ogm_packet,
	*batman_ogm_packet,
	struct hard_iface *if_incoming,		struct hard_iface *if_incoming,
	const unsigned char *tt_buff,		const unsigned char *tt_buff,
	int is_duplicate)		int is_duplicate)
	@@ -661,7 +664,8 @@ static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv,
	if (!orig_tmp)		if (!orig_tmp)
	goto unlock;		goto unlock;

	neigh_node = bat_iv_ogm_neigh_new(if_incoming, ethhdr->h_source,		neigh_node = batadv_iv_ogm_neigh_new(if_incoming,
			ethhdr->h_source,
	orig_node, orig_tmp,		orig_node, orig_tmp,
	batman_ogm_packet->seqno);		batman_ogm_packet->seqno);

	@@ -759,7 +763,7 @@ static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv,
	batadv_neigh_node_free_ref(router);		batadv_neigh_node_free_ref(router);
	}		}

	static int bat_iv_ogm_calc_tq(struct orig_node *orig_node,		static int batadv_iv_ogm_calc_tq(struct orig_node *orig_node,
	struct orig_node *orig_neigh_node,		struct orig_node *orig_neigh_node,
	struct batman_ogm_packet *batman_ogm_packet,		struct batman_ogm_packet *batman_ogm_packet,
	struct hard_iface *if_incoming)		struct hard_iface *if_incoming)
	@@ -792,7 +796,7 @@ static int bat_iv_ogm_calc_tq(struct orig_node *orig_node,
	rcu_read_unlock();		rcu_read_unlock();

	if (!neigh_node)		if (!neigh_node)
	neigh_node = bat_iv_ogm_neigh_new(if_incoming,		neigh_node = batadv_iv_ogm_neigh_new(if_incoming,
	orig_neigh_node->orig,		orig_neigh_node->orig,
	orig_neigh_node,		orig_neigh_node,
	orig_neigh_node,		orig_neigh_node,
	@@ -873,9 +877,9 @@ static int bat_iv_ogm_calc_tq(struct orig_node *orig_node,
	* -1 the packet is old and has been received while the seqno window		* -1 the packet is old and has been received while the seqno window
	* was protected. Caller should drop it.		* was protected. Caller should drop it.
	*/		*/
	static int bat_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,		static int
	const struct batman_ogm_packet		batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,
	*batman_ogm_packet,		const struct batman_ogm_packet *batman_ogm_packet,
	const struct hard_iface *if_incoming)		const struct hard_iface *if_incoming)
	{		{
	struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);		struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
	@@ -943,7 +947,7 @@ static int bat_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,
	return ret;		return ret;
	}		}

	static void bat_iv_ogm_process(const struct ethhdr *ethhdr,		static void batadv_iv_ogm_process(const struct ethhdr *ethhdr,
	struct batman_ogm_packet *batman_ogm_packet,		struct batman_ogm_packet *batman_ogm_packet,
	const unsigned char *tt_buff,		const unsigned char *tt_buff,
	struct hard_iface *if_incoming)		struct hard_iface *if_incoming)
	@@ -955,10 +959,10 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
	struct neigh_node *orig_neigh_router = NULL;		struct neigh_node *orig_neigh_router = NULL;
	int has_directlink_flag;		int has_directlink_flag;
	int is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0;		int is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0;
	int is_broadcast = 0, is_bidirectional;		int is_broadcast = 0, is_bidirect;
	bool is_single_hop_neigh = false;		bool is_single_hop_neigh = false;
	bool is_from_best_next_hop = false;		bool is_from_best_next_hop = false;
	int is_duplicate;		int is_duplicate, sameseq, simlar_ttl;
	uint32_t if_incoming_seqno;		uint32_t if_incoming_seqno;
	uint8_t *prev_sender;		uint8_t *prev_sender;

	@@ -1095,7 +1099,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
	if (!orig_node)		if (!orig_node)
	return;		return;

	is_duplicate = bat_iv_ogm_update_seqnos(ethhdr, batman_ogm_packet,		is_duplicate = batadv_iv_ogm_update_seqnos(ethhdr, batman_ogm_packet,
	if_incoming);		if_incoming);

	if (is_duplicate == -1) {		if (is_duplicate == -1) {
	@@ -1151,7 +1155,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
	goto out_neigh;		goto out_neigh;
	}		}

	is_bidirectional = bat_iv_ogm_calc_tq(orig_node, orig_neigh_node,		is_bidirect = batadv_iv_ogm_calc_tq(orig_node, orig_neigh_node,
	batman_ogm_packet, if_incoming);		batman_ogm_packet, if_incoming);

	batadv_bonding_save_primary(orig_node, orig_neigh_node,		batadv_bonding_save_primary(orig_node, orig_neigh_node,
	@@ -1160,11 +1164,10 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
	/* update ranking if it is not a duplicate or has the same		/* update ranking if it is not a duplicate or has the same
	* seqno and similar ttl as the non-duplicate		* seqno and similar ttl as the non-duplicate
	*/		*/
	if (is_bidirectional &&		sameseq = orig_node->last_real_seqno == ntohl(batman_ogm_packet->seqno);
	(!is_duplicate \|\|		simlar_ttl = orig_node->last_ttl - 3 <= batman_ogm_packet->header.ttl;
	((orig_node->last_real_seqno == ntohl(batman_ogm_packet->seqno)) &&		if (is_bidirect && (!is_duplicate \|\| (sameseq && simlar_ttl)))
	(orig_node->last_ttl - 3 <= batman_ogm_packet->header.ttl))))		batadv_iv_ogm_orig_update(bat_priv, orig_node, ethhdr,
	bat_iv_ogm_orig_update(bat_priv, orig_node, ethhdr,
	batman_ogm_packet, if_incoming,		batman_ogm_packet, if_incoming,
	tt_buff, is_duplicate);		tt_buff, is_duplicate);

	@@ -1172,9 +1175,9 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
	if (is_single_hop_neigh) {		if (is_single_hop_neigh) {

	/* mark direct link on incoming interface */		/* mark direct link on incoming interface */
	bat_iv_ogm_forward(orig_node, ethhdr, batman_ogm_packet,		batadv_iv_ogm_forward(orig_node, ethhdr, batman_ogm_packet,
	is_single_hop_neigh, is_from_best_next_hop,		is_single_hop_neigh,
	if_incoming);		is_from_best_next_hop, if_incoming);

	batadv_dbg(DBG_BATMAN, bat_priv,		batadv_dbg(DBG_BATMAN, bat_priv,
	"Forwarding packet: rebroadcast neighbor packet with direct link flag\n");		"Forwarding packet: rebroadcast neighbor packet with direct link flag\n");
	@@ -1182,7 +1185,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
	}		}

	/* multihop originator */		/* multihop originator */
	if (!is_bidirectional) {		if (!is_bidirect) {
	batadv_dbg(DBG_BATMAN, bat_priv,		batadv_dbg(DBG_BATMAN, bat_priv,
	"Drop packet: not received via bidirectional link\n");		"Drop packet: not received via bidirectional link\n");
	goto out_neigh;		goto out_neigh;
	@@ -1196,7 +1199,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,

	batadv_dbg(DBG_BATMAN, bat_priv,		batadv_dbg(DBG_BATMAN, bat_priv,
	"Forwarding packet: rebroadcast originator packet\n");		"Forwarding packet: rebroadcast originator packet\n");
	bat_iv_ogm_forward(orig_node, ethhdr, batman_ogm_packet,		batadv_iv_ogm_forward(orig_node, ethhdr, batman_ogm_packet,
	is_single_hop_neigh, is_from_best_next_hop,		is_single_hop_neigh, is_from_best_next_hop,
	if_incoming);		if_incoming);

	@@ -1214,7 +1217,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
	batadv_orig_node_free_ref(orig_node);		batadv_orig_node_free_ref(orig_node);
	}		}

	static int bat_iv_ogm_receive(struct sk_buff *skb,		static int batadv_iv_ogm_receive(struct sk_buff *skb,
	struct hard_iface *if_incoming)		struct hard_iface *if_incoming)
	{		{
	struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);		struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
	@@ -1231,7 +1234,7 @@ static int bat_iv_ogm_receive(struct sk_buff *skb,
	/* did we receive a B.A.T.M.A.N. IV OGM packet on an interface		/* did we receive a B.A.T.M.A.N. IV OGM packet on an interface
	* that does not have B.A.T.M.A.N. IV enabled ?		* that does not have B.A.T.M.A.N. IV enabled ?
	*/		*/
	if (bat_priv->bat_algo_ops->bat_ogm_emit != bat_iv_ogm_emit)		if (bat_priv->bat_algo_ops->bat_ogm_emit != batadv_iv_ogm_emit)
	return NET_RX_DROP;		return NET_RX_DROP;

	batadv_inc_counter(bat_priv, BAT_CNT_MGMT_RX);		batadv_inc_counter(bat_priv, BAT_CNT_MGMT_RX);
	@@ -1247,29 +1250,29 @@ static int bat_iv_ogm_receive(struct sk_buff *skb,
	do {		do {
	tt_buff = packet_buff + buff_pos + BATMAN_OGM_HLEN;		tt_buff = packet_buff + buff_pos + BATMAN_OGM_HLEN;

	bat_iv_ogm_process(ethhdr, batman_ogm_packet,		batadv_iv_ogm_process(ethhdr, batman_ogm_packet, tt_buff,
	tt_buff, if_incoming);		if_incoming);

	buff_pos += BATMAN_OGM_HLEN;		buff_pos += BATMAN_OGM_HLEN;
	buff_pos += batadv_tt_len(batman_ogm_packet->tt_num_changes);		buff_pos += batadv_tt_len(batman_ogm_packet->tt_num_changes);

	batman_ogm_packet = (struct batman_ogm_packet *)		batman_ogm_packet = (struct batman_ogm_packet *)
	(packet_buff + buff_pos);		(packet_buff + buff_pos);
	} while (bat_iv_ogm_aggr_packet(buff_pos, packet_len,		} while (batadv_iv_ogm_aggr_packet(buff_pos, packet_len,
	batman_ogm_packet->tt_num_changes));		batman_ogm_packet->tt_num_changes));

	kfree_skb(skb);		kfree_skb(skb);
	return NET_RX_SUCCESS;		return NET_RX_SUCCESS;
	}		}

	static struct bat_algo_ops batman_iv __read_mostly = {		static struct bat_algo_ops batadv_batman_iv __read_mostly = {
	.name = "BATMAN_IV",		.name = "BATMAN_IV",
	.bat_iface_enable = bat_iv_ogm_iface_enable,		.bat_iface_enable = batadv_iv_ogm_iface_enable,
	.bat_iface_disable = bat_iv_ogm_iface_disable,		.bat_iface_disable = batadv_iv_ogm_iface_disable,
	.bat_iface_update_mac = bat_iv_ogm_iface_update_mac,		.bat_iface_update_mac = batadv_iv_ogm_iface_update_mac,
	.bat_primary_iface_set = bat_iv_ogm_primary_iface_set,		.bat_primary_iface_set = batadv_iv_ogm_primary_iface_set,
	.bat_ogm_schedule = bat_iv_ogm_schedule,		.bat_ogm_schedule = batadv_iv_ogm_schedule,
	.bat_ogm_emit = bat_iv_ogm_emit,		.bat_ogm_emit = batadv_iv_ogm_emit,
	};		};

	int __init batadv_iv_init(void)		int __init batadv_iv_init(void)
	@@ -1277,11 +1280,11 @@ int __init batadv_iv_init(void)
	int ret;		int ret;

	/* batman originator packet */		/* batman originator packet */
	ret = batadv_recv_handler_register(BAT_IV_OGM, bat_iv_ogm_receive);		ret = batadv_recv_handler_register(BAT_IV_OGM, batadv_iv_ogm_receive);
	if (ret < 0)		if (ret < 0)
	goto out;		goto out;

	ret = batadv_algo_register(&batman_iv);		ret = batadv_algo_register(&batadv_batman_iv);
	if (ret < 0)		if (ret < 0)
	goto handler_unregister;		goto handler_unregister;