1 files changed, 51 insertions, 28 deletions

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 21c53577c8d6..b9a28d2dd3e8 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -93,7 +93,14 @@ static int batadv_interface_release(struct net_device *dev)
 static struct net_device_stats *batadv_interface_stats(struct net_device *dev)
 {
         struct batadv_priv *bat_priv = netdev_priv(dev);
-        return &bat_priv->stats;
+        struct net_device_stats *stats = &bat_priv->stats;
+
+        stats->tx_packets = batadv_sum_counter(bat_priv, BATADV_CNT_TX);
+        stats->tx_bytes = batadv_sum_counter(bat_priv, BATADV_CNT_TX_BYTES);
+        stats->tx_dropped = batadv_sum_counter(bat_priv, BATADV_CNT_TX_DROPPED);
+        stats->rx_packets = batadv_sum_counter(bat_priv, BATADV_CNT_RX);
+        stats->rx_bytes = batadv_sum_counter(bat_priv, BATADV_CNT_RX_BYTES);
+        return stats;
 }
 
 static int batadv_interface_set_mac_addr(struct net_device *dev, void *p)
@@ -145,6 +152,7 @@ static int batadv_interface_tx(struct sk_buff *skb,
         int data_len = skb->len, ret;
         short vid __maybe_unused = -1;
         bool do_bcast = false;
+        uint32_t seqno;
 
         if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE)
                 goto dropped;
@@ -226,8 +234,8 @@ static int batadv_interface_tx(struct sk_buff *skb,
                        primary_if->net_dev->dev_addr, ETH_ALEN);
 
                 /* set broadcast sequence number */
-                bcast_packet->seqno =
-                        htonl(atomic_inc_return(&bat_priv->bcast_seqno));
+                seqno = atomic_inc_return(&bat_priv->bcast_seqno);
+                bcast_packet->seqno = htonl(seqno);
 
                 batadv_add_bcast_packet_to_list(bat_priv, skb, 1);
 
@@ -249,14 +257,14 @@ static int batadv_interface_tx(struct sk_buff *skb,
                         goto dropped_freed;
         }
 
-        bat_priv->stats.tx_packets++;
-        bat_priv->stats.tx_bytes += data_len;
+        batadv_inc_counter(bat_priv, BATADV_CNT_TX);
+        batadv_add_counter(bat_priv, BATADV_CNT_TX_BYTES, data_len);
         goto end;
 
 dropped:
         kfree_skb(skb);
 dropped_freed:
-        bat_priv->stats.tx_dropped++;
+        batadv_inc_counter(bat_priv, BATADV_CNT_TX_DROPPED);
 end:
         if (primary_if)
                 batadv_hardif_free_ref(primary_if);
@@ -265,7 +273,7 @@ end:
 
 void batadv_interface_rx(struct net_device *soft_iface,
                          struct sk_buff *skb, struct batadv_hard_iface *recv_if,
-                         int hdr_size)
+                         int hdr_size, struct batadv_orig_node *orig_node)
 {
         struct batadv_priv *bat_priv = netdev_priv(soft_iface);
         struct ethhdr *ethhdr;
@@ -311,11 +319,16 @@ void batadv_interface_rx(struct net_device *soft_iface,
 
         /* skb->ip_summed = CHECKSUM_UNNECESSARY; */
 
-        bat_priv->stats.rx_packets++;
-        bat_priv->stats.rx_bytes += skb->len + ETH_HLEN;
+        batadv_inc_counter(bat_priv, BATADV_CNT_RX);
+        batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES,
+                           skb->len + ETH_HLEN);
 
         soft_iface->last_rx = jiffies;
 
+        if (orig_node)
+                batadv_tt_add_temporary_global_entry(bat_priv, orig_node,
+                                                     ethhdr->h_source);
+
         if (batadv_is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest))
                 goto dropped;
 
@@ -382,15 +395,22 @@ struct net_device *batadv_softif_create(const char *name)
         if (!soft_iface)
                 goto out;
 
+        bat_priv = netdev_priv(soft_iface);
+
+        /* batadv_interface_stats() needs to be available as soon as
+         * register_netdevice() has been called
+         */
+        bat_priv->bat_counters = __alloc_percpu(cnt_len, __alignof__(uint64_t));
+        if (!bat_priv->bat_counters)
+                goto free_soft_iface;
+
         ret = register_netdevice(soft_iface);
         if (ret < 0) {
                 pr_err("Unable to register the batman interface '%s': %i\n",
                        name, ret);
-                goto free_soft_iface;
+                goto free_bat_counters;
         }
 
-        bat_priv = netdev_priv(soft_iface);
-
         atomic_set(&bat_priv->aggregated_ogms, 1);
         atomic_set(&bat_priv->bonding, 0);
         atomic_set(&bat_priv->bridge_loop_avoidance, 0);
@@ -408,29 +428,26 @@ struct net_device *batadv_softif_create(const char *name)
 
         atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
         atomic_set(&bat_priv->bcast_seqno, 1);
-        atomic_set(&bat_priv->ttvn, 0);
-        atomic_set(&bat_priv->tt_local_changes, 0);
-        atomic_set(&bat_priv->tt_ogm_append_cnt, 0);
-        atomic_set(&bat_priv->bla_num_requests, 0);
-
-        bat_priv->tt_buff = NULL;
-        bat_priv->tt_buff_len = 0;
-        bat_priv->tt_poss_change = false;
+        atomic_set(&bat_priv->tt.vn, 0);
+        atomic_set(&bat_priv->tt.local_changes, 0);
+        atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
+#ifdef CONFIG_BATMAN_ADV_BLA
+        atomic_set(&bat_priv->bla.num_requests, 0);
+#endif
+        bat_priv->tt.last_changeset = NULL;
+        bat_priv->tt.last_changeset_len = 0;
+        bat_priv->tt.poss_change = false;
 
         bat_priv->primary_if = NULL;
         bat_priv->num_ifaces = 0;
 
-        bat_priv->bat_counters = __alloc_percpu(cnt_len, __alignof__(uint64_t));
-        if (!bat_priv->bat_counters)
-                goto unreg_soft_iface;
-
         ret = batadv_algo_select(bat_priv, batadv_routing_algo);
         if (ret < 0)
-                goto free_bat_counters;
+                goto unreg_soft_iface;
 
         ret = batadv_sysfs_add_meshif(soft_iface);
         if (ret < 0)
-                goto free_bat_counters;
+                goto unreg_soft_iface;
 
         ret = batadv_debugfs_add_meshif(soft_iface);
         if (ret < 0)
@@ -446,12 +463,13 @@ unreg_debugfs:
         batadv_debugfs_del_meshif(soft_iface);
 unreg_sysfs:
         batadv_sysfs_del_meshif(soft_iface);
-free_bat_counters:
-        free_percpu(bat_priv->bat_counters);
 unreg_soft_iface:
+        free_percpu(bat_priv->bat_counters);
         unregister_netdevice(soft_iface);
         return NULL;
 
+free_bat_counters:
+        free_percpu(bat_priv->bat_counters);
 free_soft_iface:
         free_netdev(soft_iface);
 out:
@@ -521,6 +539,11 @@ static u32 batadv_get_link(struct net_device *dev)
 static const struct {
         const char name[ETH_GSTRING_LEN];
 } batadv_counters_strings[] = {
+        { "tx" },
+        { "tx_bytes" },
+        { "tx_dropped" },
+        { "rx" },
+        { "rx_bytes" },
         { "forward" },
         { "forward_bytes" },
         { "mgmt_tx" },