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

Commit da641193 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

batman-adv: Prefix originator static inline functions with batadv_ 



All non-static symbols of batman-adv were prefixed with batadv_ to avoid
collisions with other symbols of the kernel. Other symbols of batman-adv
should use the same prefix to keep the naming scheme consistent.

Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
parent c0a55929

net/batman-adv/bridge_loop_avoidance.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -390,7 +390,7 @@ static struct backbone_gw *bla_get_backbone_gw(struct bat_priv *bat_priv, 
	}

	}





	/* this is a gateway now, remove any tt entries */

	/* this is a gateway now, remove any tt entries */

	orig_node = orig_hash_find(bat_priv, orig);

	orig_node = batadv_orig_hash_find(bat_priv, orig);

	if (orig_node) {

	if (orig_node) {

		batadv_tt_global_del_orig(bat_priv, orig_node,

		batadv_tt_global_del_orig(bat_priv, orig_node,

					  "became a backbone gateway");

					  "became a backbone gateway");
@@ -780,7 +780,7 @@ static int check_claim_group(struct bat_priv *bat_priv, 
		return 2;

		return 2;





	/* lets see if this originator is in our mesh */

	/* lets see if this originator is in our mesh */

	orig_node = orig_hash_find(bat_priv, backbone_addr);

	orig_node = batadv_orig_hash_find(bat_priv, backbone_addr);





	/* dont accept claims from gateways which are not in

	/* dont accept claims from gateways which are not in

	 * the same mesh or group.

	 * the same mesh or group.

net/batman-adv/icmp_socket.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -213,7 +213,7 @@ static ssize_t bat_socket_write(struct file *file, const char __user *buff, 
	if (atomic_read(&bat_priv->mesh_state) != MESH_ACTIVE)

	if (atomic_read(&bat_priv->mesh_state) != MESH_ACTIVE)

		goto dst_unreach;

		goto dst_unreach;





	orig_node = orig_hash_find(bat_priv, icmp_packet->dst);

	orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->dst);

	if (!orig_node)

	if (!orig_node)

		goto dst_unreach;

		goto dst_unreach;

net/batman-adv/originator.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -195,7 +195,7 @@ struct orig_node *batadv_get_orig_node(struct bat_priv *bat_priv, 
	int size;

	int size;

	int hash_added;

	int hash_added;





	orig_node = orig_hash_find(bat_priv, addr);

	orig_node = batadv_orig_hash_find(bat_priv, addr);

	if (orig_node)

	if (orig_node)

		return orig_node;

		return orig_node;
@@ -249,7 +249,7 @@ struct orig_node *batadv_get_orig_node(struct bat_priv *bat_priv, 
		goto free_bcast_own;

		goto free_bcast_own;





	hash_added = batadv_hash_add(bat_priv->orig_hash, compare_orig,

	hash_added = batadv_hash_add(bat_priv->orig_hash, compare_orig,

				     choose_orig, orig_node,

				     batadv_choose_orig, orig_node,

				     &orig_node->hash_entry);

				     &orig_node->hash_entry);

	if (hash_added != 0)

	if (hash_added != 0)

		goto free_bcast_own_sum;

		goto free_bcast_own_sum;

net/batman-adv/originator.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@ int batadv_orig_hash_del_if(struct hard_iface *hard_iface, int max_if_num); 
/* hashfunction to choose an entry in a hash table of given size

/* hashfunction to choose an entry in a hash table of given size

 * hash algorithm from http://en.wikipedia.org/wiki/Hash_table

 * hash algorithm from http://en.wikipedia.org/wiki/Hash_table

 */

 */

static inline uint32_t choose_orig(const void *data, uint32_t size)

static inline uint32_t batadv_choose_orig(const void *data, uint32_t size)

{

{

	const unsigned char *key = data;

	const unsigned char *key = data;

	uint32_t hash = 0;

	uint32_t hash = 0;
@@ -60,7 +60,7 @@ static inline uint32_t choose_orig(const void *data, uint32_t size) 
	return hash % size;

	return hash % size;

}

}





static inline struct orig_node *orig_hash_find(struct bat_priv *bat_priv,

static inline struct orig_node *batadv_orig_hash_find(struct bat_priv *bat_priv,

						      const void *data)

						      const void *data)

{

{

	struct hashtable_t *hash = bat_priv->orig_hash;

	struct hashtable_t *hash = bat_priv->orig_hash;
@@ -72,7 +72,7 @@ static inline struct orig_node *orig_hash_find(struct bat_priv *bat_priv, 
	if (!hash)

	if (!hash)

		return NULL;

		return NULL;





	index = choose_orig(data, hash->size);

	index = batadv_choose_orig(data, hash->size);

	head = &hash->table[index];

	head = &hash->table[index];





	rcu_read_lock();

	rcu_read_lock();

net/batman-adv/routing.c

+15 −11
Original line number Original line Diff line number Diff line
@@ -298,7 +298,7 @@ static int recv_my_icmp_packet(struct bat_priv *bat_priv, 




	/* answer echo request (ping) */

	/* answer echo request (ping) */

	/* get routing information */

	/* get routing information */

	orig_node = orig_hash_find(bat_priv, icmp_packet->orig);

	orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->orig);

	if (!orig_node)

	if (!orig_node)

		goto out;

		goto out;
@@ -353,7 +353,7 @@ static int recv_icmp_ttl_exceeded(struct bat_priv *bat_priv, 
		goto out;

		goto out;





	/* get routing information */

	/* get routing information */

	orig_node = orig_hash_find(bat_priv, icmp_packet->orig);

	orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->orig);

	if (!orig_node)

	if (!orig_node)

		goto out;

		goto out;
@@ -437,7 +437,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, struct hard_iface *recv_if) 
		return recv_icmp_ttl_exceeded(bat_priv, skb);

		return recv_icmp_ttl_exceeded(bat_priv, skb);





	/* get routing information */

	/* get routing information */

	orig_node = orig_hash_find(bat_priv, icmp_packet->dst);

	orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->dst);

	if (!orig_node)

	if (!orig_node)

		goto out;

		goto out;
@@ -684,7 +684,7 @@ int batadv_recv_roam_adv(struct sk_buff *skb, struct hard_iface *recv_if) 
	if (batadv_bla_is_backbone_gw_orig(bat_priv, roam_adv_packet->src))

	if (batadv_bla_is_backbone_gw_orig(bat_priv, roam_adv_packet->src))

		goto out;

		goto out;





	orig_node = orig_hash_find(bat_priv, roam_adv_packet->src);

	orig_node = batadv_orig_hash_find(bat_priv, roam_adv_packet->src);

	if (!orig_node)

	if (!orig_node)

		goto out;

		goto out;
@@ -721,6 +721,7 @@ struct neigh_node *batadv_find_router(struct bat_priv *bat_priv, 
	struct neigh_node *router;

	struct neigh_node *router;

	static uint8_t zero_mac[ETH_ALEN] = {0, 0, 0, 0, 0, 0};

	static uint8_t zero_mac[ETH_ALEN] = {0, 0, 0, 0, 0, 0};

	int bonding_enabled;

	int bonding_enabled;

	uint8_t *primary_addr;





	if (!orig_node)

	if (!orig_node)

		return NULL;

		return NULL;
@@ -743,20 +744,22 @@ struct neigh_node *batadv_find_router(struct bat_priv *bat_priv, 
	if ((!recv_if) && (!bonding_enabled))

	if ((!recv_if) && (!bonding_enabled))

		goto return_router;

		goto return_router;





	primary_addr = router_orig->primary_addr;



	/* if we have something in the primary_addr, we can search

	/* if we have something in the primary_addr, we can search

	 * for a potential bonding candidate.

	 * for a potential bonding candidate.

	 */

	 */

	if (compare_eth(router_orig->primary_addr, zero_mac))

	if (compare_eth(primary_addr, zero_mac))

		goto return_router;

		goto return_router;





	/* find the orig_node which has the primary interface. might

	/* find the orig_node which has the primary interface. might

	 * even be the same as our router_orig in many cases

	 * even be the same as our router_orig in many cases

	 */

	 */

	if (compare_eth(router_orig->primary_addr, router_orig->orig)) {

	if (compare_eth(primary_addr, router_orig->orig)) {

		primary_orig_node = router_orig;

		primary_orig_node = router_orig;

	} else {

	} else {

		primary_orig_node = orig_hash_find(bat_priv,

		primary_orig_node = batadv_orig_hash_find(bat_priv,

						   router_orig->primary_addr);

							  primary_addr);

		if (!primary_orig_node)

		if (!primary_orig_node)

			goto return_router;

			goto return_router;
@@ -839,7 +842,7 @@ static int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if) 
	}

	}





	/* get routing information */

	/* get routing information */

	orig_node = orig_hash_find(bat_priv, unicast_packet->dest);

	orig_node = batadv_orig_hash_find(bat_priv, unicast_packet->dest);





	if (!orig_node)

	if (!orig_node)

		goto out;

		goto out;
@@ -922,7 +925,8 @@ static int check_unicast_ttvn(struct bat_priv *bat_priv, 
		tt_poss_change = bat_priv->tt_poss_change;

		tt_poss_change = bat_priv->tt_poss_change;

		curr_ttvn = (uint8_t)atomic_read(&bat_priv->ttvn);

		curr_ttvn = (uint8_t)atomic_read(&bat_priv->ttvn);

	} else {

	} else {

		orig_node = orig_hash_find(bat_priv, unicast_packet->dest);

		orig_node = batadv_orig_hash_find(bat_priv,

						  unicast_packet->dest);





		if (!orig_node)

		if (!orig_node)

			return 0;

			return 0;
@@ -1078,7 +1082,7 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, struct hard_iface *recv_if) 
	if (bcast_packet->header.ttl < 2)

	if (bcast_packet->header.ttl < 2)

		goto out;

		goto out;





	orig_node = orig_hash_find(bat_priv, bcast_packet->orig);

	orig_node = batadv_orig_hash_find(bat_priv, bcast_packet->orig);





	if (!orig_node)

	if (!orig_node)

		goto out;

		goto out;