Commit c408c1b9 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Simon Wunderlich
Browse files

batman-adv: Move batadv_sum_counter to soft-interface.c 



The function batadv_sum_counter is only used in soft-interface.c and has no
special relevance for main.h.

Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent 739ae86c

net/batman-adv/main.h

+0 −21
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ enum batadv_uev_type { 


#include <linux/bitops.h> /* for packet.h */

#include <linux/compiler.h>

#include <linux/cpumask.h>

#include <linux/etherdevice.h>

#include <linux/if_ether.h> /* for packet.h */

#include <linux/if_vlan.h>
@@ -284,26 +283,6 @@ static inline void batadv_add_counter(struct batadv_priv *bat_priv, size_t idx, 


#define batadv_inc_counter(b, i) batadv_add_counter(b, i, 1)



/**

 * batadv_sum_counter - Sum the cpu-local counters for index 'idx'

 * @bat_priv: the bat priv with all the soft interface information

 * @idx: index of counter to sum up

 *

 * Return: sum of all cpu-local counters

 */

static inline u64 batadv_sum_counter(struct batadv_priv *bat_priv,  size_t idx)

{

	u64 *counters, sum = 0;

	int cpu;



	for_each_possible_cpu(cpu) {

		counters = per_cpu_ptr(bat_priv->bat_counters, cpu);

		sum += counters[idx];

	}



	return sum;

}



/* Define a macro to reach the control buffer of the skb. The members of the

 * control buffer are defined in struct batadv_skb_cb in types.h.

 * The macro is inspired by the similar macro TCP_SKB_CB() in tcp.h.

net/batman-adv/soft-interface.c

+21 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/byteorder/generic.h>

#include <linux/cache.h>

#include <linux/compiler.h>

#include <linux/cpumask.h>

#include <linux/errno.h>

#include <linux/etherdevice.h>

#include <linux/ethtool.h>
@@ -116,6 +117,26 @@ static int batadv_interface_release(struct net_device *dev) 
	return 0;

}



/**

 * batadv_sum_counter - Sum the cpu-local counters for index 'idx'

 * @bat_priv: the bat priv with all the soft interface information

 * @idx: index of counter to sum up

 *

 * Return: sum of all cpu-local counters

 */

static u64 batadv_sum_counter(struct batadv_priv *bat_priv,  size_t idx)

{

	u64 *counters, sum = 0;

	int cpu;



	for_each_possible_cpu(cpu) {

		counters = per_cpu_ptr(bat_priv->bat_counters, cpu);

		sum += counters[idx];

	}



	return sum;

}



static struct net_device_stats *batadv_interface_stats(struct net_device *dev)

{

	struct batadv_priv *bat_priv = netdev_priv(dev);