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

batman-adv: Prefix ring_buffer non-static functions with batadv_ 



batman-adv can be compiled as part of the kernel instead of an module. In that
case the linker will see all non-static symbols of batman-adv and all other
non-static symbols of the kernel. This could lead to symbol collisions. A
prefix for the batman-adv symbols that defines their private namespace avoids
such a problem.

Reported-by: default avatarDavid Miller <davem@davemloft.net>
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
parent 7d211efc

net/batman-adv/bat_iv_ogm.c

+7 −7
Original line number Diff line number Diff line
@@ -642,10 +642,10 @@ static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv, 
			continue;



		spin_lock_bh(&tmp_neigh_node->lq_update_lock);

		ring_buffer_set(tmp_neigh_node->tq_recv,

		batadv_ring_buffer_set(tmp_neigh_node->tq_recv,

				       &tmp_neigh_node->tq_index, 0);

		tmp_neigh_node->tq_avg =

			ring_buffer_avg(tmp_neigh_node->tq_recv);

			batadv_ring_buffer_avg(tmp_neigh_node->tq_recv);

		spin_unlock_bh(&tmp_neigh_node->lq_update_lock);

	}
@@ -673,10 +673,10 @@ static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv, 
	neigh_node->last_seen = jiffies;



	spin_lock_bh(&neigh_node->lq_update_lock);

	ring_buffer_set(neigh_node->tq_recv,

	batadv_ring_buffer_set(neigh_node->tq_recv,

			       &neigh_node->tq_index,

			       batman_ogm_packet->tq);

	neigh_node->tq_avg = ring_buffer_avg(neigh_node->tq_recv);

	neigh_node->tq_avg = batadv_ring_buffer_avg(neigh_node->tq_recv);

	spin_unlock_bh(&neigh_node->lq_update_lock);



	if (!is_duplicate) {

net/batman-adv/ring_buffer.c

+3 −2
Original line number Diff line number Diff line
@@ -22,13 +22,14 @@ 
#include "main.h"

#include "ring_buffer.h"



void ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index, uint8_t value)

void batadv_ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index,

			    uint8_t value)

{

	lq_recv[*lq_index] = value;

	*lq_index = (*lq_index + 1) % TQ_GLOBAL_WINDOW_SIZE;

}



uint8_t ring_buffer_avg(const uint8_t lq_recv[])

uint8_t batadv_ring_buffer_avg(const uint8_t lq_recv[])

{

	const uint8_t *ptr;

	uint16_t count = 0, i = 0, sum = 0;

net/batman-adv/ring_buffer.h

+3 −2
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 
#ifndef _NET_BATMAN_ADV_RING_BUFFER_H_

#define _NET_BATMAN_ADV_RING_BUFFER_H_



void ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index, uint8_t value);

uint8_t ring_buffer_avg(const uint8_t lq_recv[]);

void batadv_ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index,

			    uint8_t value);

uint8_t batadv_ring_buffer_avg(const uint8_t lq_recv[]);



#endif /* _NET_BATMAN_ADV_RING_BUFFER_H_ */