Merge tag 'boards2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / net / batman-adv / ring_buffer.c

diff --git a/net/batman-adv/ring_buffer.c b/net/batman-adv/ring_buffer.c
index fd63951d118d44530e2221a42e2ff8bb798444c5..c8f61e395b74864de3ef5c7944074358eda1706c 100644 (file)
--- a/net/batman-adv/ring_buffer.c
+++ b/net/batman-adv/ring_buffer.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
@@ -16,26 +15,26 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #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;
+       *lq_index = (*lq_index + 1) % BATADV_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;
 
        ptr = lq_recv;
 
-       while (i < TQ_GLOBAL_WINDOW_SIZE) {
+       while (i < BATADV_TQ_GLOBAL_WINDOW_SIZE) {
                if (*ptr != 0) {
                        count++;
                        sum += *ptr;