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

Commit ab044f8e authored by Tobias Klauser's avatar Tobias Klauser Committed by Simon Wunderlich
Browse files

batman-adv: Use net_device_stats from struct net_device 



Instead of using a private copy of struct net_device_stats in struct
batadv_priv, use stats from struct net_device.

Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent 5405e19e

net/batman-adv/distributed-arp-table.c

+5 −4
Original line number Diff line number Diff line
@@ -1003,6 +1003,7 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, 
	bool ret = false;

	struct batadv_dat_entry *dat_entry = NULL;

	struct sk_buff *skb_new;

	struct net_device *soft_iface = bat_priv->soft_iface;

	int hdr_size = 0;

	unsigned short vid;
@@ -1061,10 +1062,10 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, 
		if (!skb_new)

			goto out;



		skb_new->protocol = eth_type_trans(skb_new,

						   bat_priv->soft_iface);

		bat_priv->stats.rx_packets++;

		bat_priv->stats.rx_bytes += skb->len + ETH_HLEN + hdr_size;

		skb_new->protocol = eth_type_trans(skb_new, soft_iface);



		soft_iface->stats.rx_packets++;

		soft_iface->stats.rx_bytes += skb->len + ETH_HLEN + hdr_size;



		netif_rx(skb_new);

		batadv_dbg(BATADV_DBG_DAT, bat_priv, "ARP request replied locally\n");

net/batman-adv/soft-interface.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static u64 batadv_sum_counter(struct batadv_priv *bat_priv, size_t idx) 
static struct net_device_stats *batadv_interface_stats(struct net_device *dev)

{

	struct batadv_priv *bat_priv = netdev_priv(dev);

	struct net_device_stats *stats = &bat_priv->stats;

	struct net_device_stats *stats = &dev->stats;



	stats->tx_packets = batadv_sum_counter(bat_priv, BATADV_CNT_TX);

	stats->tx_bytes = batadv_sum_counter(bat_priv, BATADV_CNT_TX_BYTES);

net/batman-adv/types.h

+0 −2
Original line number Diff line number Diff line
@@ -1000,7 +1000,6 @@ struct batadv_priv_bat_v { 
 * struct batadv_priv - per mesh interface data

 * @mesh_state: current status of the mesh (inactive/active/deactivating)

 * @soft_iface: net device which holds this struct as private data

 * @stats: structure holding the data for the ndo_get_stats() call

 * @bat_counters: mesh internal traffic statistic counters (see batadv_counters)

 * @aggregated_ogms: bool indicating whether OGM aggregation is enabled

 * @bonding: bool indicating whether traffic bonding is enabled
@@ -1055,7 +1054,6 @@ struct batadv_priv_bat_v { 
struct batadv_priv {

	atomic_t mesh_state;

	struct net_device *soft_iface;

	struct net_device_stats stats;

	u64 __percpu *bat_counters; /* Per cpu counters */

	atomic_t aggregated_ogms;

	atomic_t bonding;