1 files changed, 162 insertions, 95 deletions

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 6e2530b02043..c1b2ab2f37bb 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.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, Simon Wunderlich
  *
@@ -16,7 +15,6 @@
  * 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"
@@ -39,27 +37,33 @@
 #include "bridge_loop_avoidance.h"
 
 
-static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd);
-static void bat_get_drvinfo(struct net_device *dev,
-                            struct ethtool_drvinfo *info);
-static u32 bat_get_msglevel(struct net_device *dev);
-static void bat_set_msglevel(struct net_device *dev, u32 value);
-static u32 bat_get_link(struct net_device *dev);
-
-static const struct ethtool_ops bat_ethtool_ops = {
-        .get_settings = bat_get_settings,
-        .get_drvinfo = bat_get_drvinfo,
-        .get_msglevel = bat_get_msglevel,
-        .set_msglevel = bat_set_msglevel,
-        .get_link = bat_get_link,
+static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd);
+static void batadv_get_drvinfo(struct net_device *dev,
+                               struct ethtool_drvinfo *info);
+static u32 batadv_get_msglevel(struct net_device *dev);
+static void batadv_set_msglevel(struct net_device *dev, u32 value);
+static u32 batadv_get_link(struct net_device *dev);
+static void batadv_get_strings(struct net_device *dev, u32 stringset, u8 *data);
+static void batadv_get_ethtool_stats(struct net_device *dev,
+                                     struct ethtool_stats *stats, u64 *data);
+static int batadv_get_sset_count(struct net_device *dev, int stringset);
+
+static const struct ethtool_ops batadv_ethtool_ops = {
+        .get_settings = batadv_get_settings,
+        .get_drvinfo = batadv_get_drvinfo,
+        .get_msglevel = batadv_get_msglevel,
+        .set_msglevel = batadv_set_msglevel,
+        .get_link = batadv_get_link,
+        .get_strings = batadv_get_strings,
+        .get_ethtool_stats = batadv_get_ethtool_stats,
+        .get_sset_count = batadv_get_sset_count,
 };
 
-int my_skb_head_push(struct sk_buff *skb, unsigned int len)
+int batadv_skb_head_push(struct sk_buff *skb, unsigned int len)
 {
         int result;
 
-        /**
-         * TODO: We must check if we can release all references to non-payload
+        /* TODO: We must check if we can release all references to non-payload
          * data using skb_header_release in our skbs to allow skb_cow_header to
          * work optimally. This means that those skbs are not allowed to read
          * or write any data which is before the current position of skb->data
@@ -74,25 +78,25 @@ int my_skb_head_push(struct sk_buff *skb, unsigned int len)
         return 0;
 }
 
-static int interface_open(struct net_device *dev)
+static int batadv_interface_open(struct net_device *dev)
 {
         netif_start_queue(dev);
         return 0;
 }
 
-static int interface_release(struct net_device *dev)
+static int batadv_interface_release(struct net_device *dev)
 {
         netif_stop_queue(dev);
         return 0;
 }
 
-static struct net_device_stats *interface_stats(struct net_device *dev)
+static struct net_device_stats *batadv_interface_stats(struct net_device *dev)
 {
         struct bat_priv *bat_priv = netdev_priv(dev);
         return &bat_priv->stats;
 }
 
-static int interface_set_mac_addr(struct net_device *dev, void *p)
+static int batadv_interface_set_mac_addr(struct net_device *dev, void *p)
 {
         struct bat_priv *bat_priv = netdev_priv(dev);
         struct sockaddr *addr = p;
@@ -102,9 +106,9 @@ static int interface_set_mac_addr(struct net_device *dev, void *p)
 
         /* only modify transtable if it has been initialized before */
         if (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE) {
-                tt_local_remove(bat_priv, dev->dev_addr,
-                                "mac address changed", false);
-                tt_local_add(dev, addr->sa_data, NULL_IFINDEX);
+                batadv_tt_local_remove(bat_priv, dev->dev_addr,
+                                       "mac address changed", false);
+                batadv_tt_local_add(dev, addr->sa_data, BATADV_NULL_IFINDEX);
         }
 
         memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
@@ -112,10 +116,10 @@ static int interface_set_mac_addr(struct net_device *dev, void *p)
         return 0;
 }
 
-static int interface_change_mtu(struct net_device *dev, int new_mtu)
+static int batadv_interface_change_mtu(struct net_device *dev, int new_mtu)
 {
         /* check ranges */
-        if ((new_mtu < 68) || (new_mtu > hardif_min_mtu(dev)))
+        if ((new_mtu < 68) || (new_mtu > batadv_hardif_min_mtu(dev)))
                 return -EINVAL;
 
         dev->mtu = new_mtu;
@@ -123,13 +127,15 @@ static int interface_change_mtu(struct net_device *dev, int new_mtu)
         return 0;
 }
 
-static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
+static int batadv_interface_tx(struct sk_buff *skb,
+                               struct net_device *soft_iface)
 {
         struct ethhdr *ethhdr = (struct ethhdr *)skb->data;
         struct bat_priv *bat_priv = netdev_priv(soft_iface);
         struct hard_iface *primary_if = NULL;
         struct bcast_packet *bcast_packet;
         struct vlan_ethhdr *vhdr;
+        __be16 ethertype = __constant_htons(BATADV_ETH_P_BATMAN);
         static const uint8_t stp_addr[ETH_ALEN] = {0x01, 0x80, 0xC2, 0x00, 0x00,
                                                    0x00};
         unsigned int header_len = 0;
@@ -147,24 +153,24 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
                 vhdr = (struct vlan_ethhdr *)skb->data;
                 vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK;
 
-                if (ntohs(vhdr->h_vlan_encapsulated_proto) != ETH_P_BATMAN)
+                if (vhdr->h_vlan_encapsulated_proto != ethertype)
                         break;
 
                 /* fall through */
-        case ETH_P_BATMAN:
+        case BATADV_ETH_P_BATMAN:
                 goto dropped;
         }
 
-        if (bla_tx(bat_priv, skb, vid))
+        if (batadv_bla_tx(bat_priv, skb, vid))
                 goto dropped;
 
         /* Register the client MAC in the transtable */
-        tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif);
+        batadv_tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif);
 
         /* don't accept stp packets. STP does not help in meshes.
          * better use the bridge loop avoidance ...
          */
-        if (compare_eth(ethhdr->h_dest, stp_addr))
+        if (batadv_compare_eth(ethhdr->h_dest, stp_addr))
                 goto dropped;
 
         if (is_multicast_ether_addr(ethhdr->h_dest)) {
@@ -173,15 +179,17 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
                 switch (atomic_read(&bat_priv->gw_mode)) {
                 case GW_MODE_SERVER:
                         /* gateway servers should not send dhcp
-                         * requests into the mesh */
-                        ret = gw_is_dhcp_target(skb, &header_len);
+                         * requests into the mesh
+                         */
+                        ret = batadv_gw_is_dhcp_target(skb, &header_len);
                         if (ret)
                                 goto dropped;
                         break;
                 case GW_MODE_CLIENT:
                         /* gateway clients should send dhcp requests
-                         * via unicast to their gateway */
-                        ret = gw_is_dhcp_target(skb, &header_len);
+                         * via unicast to their gateway
+                         */
+                        ret = batadv_gw_is_dhcp_target(skb, &header_len);
                         if (ret)
                                 do_bcast = false;
                         break;
@@ -193,22 +201,23 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
 
         /* ethernet packet should be broadcasted */
         if (do_bcast) {
-                primary_if = primary_if_get_selected(bat_priv);
+                primary_if = batadv_primary_if_get_selected(bat_priv);
                 if (!primary_if)
                         goto dropped;
 
-                if (my_skb_head_push(skb, sizeof(*bcast_packet)) < 0)
+                if (batadv_skb_head_push(skb, sizeof(*bcast_packet)) < 0)
                         goto dropped;
 
                 bcast_packet = (struct bcast_packet *)skb->data;
-                bcast_packet->header.version = COMPAT_VERSION;
-                bcast_packet->header.ttl = TTL;
+                bcast_packet->header.version = BATADV_COMPAT_VERSION;
+                bcast_packet->header.ttl = BATADV_TTL;
 
                 /* batman packet type: broadcast */
                 bcast_packet->header.packet_type = BAT_BCAST;
 
                 /* hw address of first interface is the orig mac because only
-                 * this mac is known throughout the mesh */
+                 * this mac is known throughout the mesh
+                 */
                 memcpy(bcast_packet->orig,
                        primary_if->net_dev->dev_addr, ETH_ALEN);
 
@@ -216,21 +225,22 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
                 bcast_packet->seqno =
                         htonl(atomic_inc_return(&bat_priv->bcast_seqno));
 
-                add_bcast_packet_to_list(bat_priv, skb, 1);
+                batadv_add_bcast_packet_to_list(bat_priv, skb, 1);
 
                 /* a copy is stored in the bcast list, therefore removing
-                 * the original skb. */
+                 * the original skb.
+                 */
                 kfree_skb(skb);
 
         /* unicast packet */
         } else {
                 if (atomic_read(&bat_priv->gw_mode) != GW_MODE_OFF) {
-                        ret = gw_out_of_range(bat_priv, skb, ethhdr);
+                        ret = batadv_gw_out_of_range(bat_priv, skb, ethhdr);
                         if (ret)
                                 goto dropped;
                 }
 
-                ret = unicast_send_skb(skb, bat_priv);
+                ret = batadv_unicast_send_skb(skb, bat_priv);
                 if (ret != 0)
                         goto dropped_freed;
         }
@@ -245,18 +255,19 @@ dropped_freed:
         bat_priv->stats.tx_dropped++;
 end:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
         return NETDEV_TX_OK;
 }
 
-void interface_rx(struct net_device *soft_iface,
-                  struct sk_buff *skb, struct hard_iface *recv_if,
-                  int hdr_size)
+void batadv_interface_rx(struct net_device *soft_iface,
+                         struct sk_buff *skb, struct hard_iface *recv_if,
+                         int hdr_size)
 {
         struct bat_priv *bat_priv = netdev_priv(soft_iface);
         struct ethhdr *ethhdr;
         struct vlan_ethhdr *vhdr;
         short vid __maybe_unused = -1;
+        __be16 ethertype = __constant_htons(BATADV_ETH_P_BATMAN);
 
         /* check if enough space is available for pulling, and pull */
         if (!pskb_may_pull(skb, hdr_size))
@@ -272,11 +283,11 @@ void interface_rx(struct net_device *soft_iface,
                 vhdr = (struct vlan_ethhdr *)skb->data;
                 vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK;
 
-                if (ntohs(vhdr->h_vlan_encapsulated_proto) != ETH_P_BATMAN)
+                if (vhdr->h_vlan_encapsulated_proto != ethertype)
                         break;
 
                 /* fall through */
-        case ETH_P_BATMAN:
+        case BATADV_ETH_P_BATMAN:
                 goto dropped;
         }
 
@@ -287,22 +298,23 @@ void interface_rx(struct net_device *soft_iface,
 
         /* should not be necessary anymore as we use skb_pull_rcsum()
          * TODO: please verify this and remove this TODO
-         * -- Dec 21st 2009, Simon Wunderlich */
+         * -- Dec 21st 2009, Simon Wunderlich
+         */
 
-/*      skb->ip_summed = CHECKSUM_UNNECESSARY;*/
+        /* skb->ip_summed = CHECKSUM_UNNECESSARY; */
 
         bat_priv->stats.rx_packets++;
         bat_priv->stats.rx_bytes += skb->len + ETH_HLEN;
 
         soft_iface->last_rx = jiffies;
 
-        if (is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest))
+        if (batadv_is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest))
                 goto dropped;
 
         /* Let the bridge loop avoidance check the packet. If will
          * not handle it, we can safely push it up.
          */
-        if (bla_rx(bat_priv, skb, vid))
+        if (batadv_bla_rx(bat_priv, skb, vid))
                 goto out;
 
         netif_rx(skb);
@@ -314,49 +326,49 @@ out:
         return;
 }
 
-static const struct net_device_ops bat_netdev_ops = {
-        .ndo_open = interface_open,
-        .ndo_stop = interface_release,
-        .ndo_get_stats = interface_stats,
-        .ndo_set_mac_address = interface_set_mac_addr,
-        .ndo_change_mtu = interface_change_mtu,
-        .ndo_start_xmit = interface_tx,
+static const struct net_device_ops batadv_netdev_ops = {
+        .ndo_open = batadv_interface_open,
+        .ndo_stop = batadv_interface_release,
+        .ndo_get_stats = batadv_interface_stats,
+        .ndo_set_mac_address = batadv_interface_set_mac_addr,
+        .ndo_change_mtu = batadv_interface_change_mtu,
+        .ndo_start_xmit = batadv_interface_tx,
         .ndo_validate_addr = eth_validate_addr
 };
 
-static void interface_setup(struct net_device *dev)
+static void batadv_interface_setup(struct net_device *dev)
 {
         struct bat_priv *priv = netdev_priv(dev);
 
         ether_setup(dev);
 
-        dev->netdev_ops = &bat_netdev_ops;
+        dev->netdev_ops = &batadv_netdev_ops;
         dev->destructor = free_netdev;
         dev->tx_queue_len = 0;
 
-        /**
-         * can't call min_mtu, because the needed variables
+        /* can't call min_mtu, because the needed variables
          * have not been initialized yet
          */
         dev->mtu = ETH_DATA_LEN;
         /* reserve more space in the skbuff for our header */
-        dev->hard_header_len = BAT_HEADER_LEN;
+        dev->hard_header_len = BATADV_HEADER_LEN;
 
         /* generate random address */
         eth_hw_addr_random(dev);
 
-        SET_ETHTOOL_OPS(dev, &bat_ethtool_ops);
+        SET_ETHTOOL_OPS(dev, &batadv_ethtool_ops);
 
         memset(priv, 0, sizeof(*priv));
 }
 
-struct net_device *softif_create(const char *name)
+struct net_device *batadv_softif_create(const char *name)
 {
         struct net_device *soft_iface;
         struct bat_priv *bat_priv;
         int ret;
 
-        soft_iface = alloc_netdev(sizeof(*bat_priv), name, interface_setup);
+        soft_iface = alloc_netdev(sizeof(*bat_priv), name,
+                                  batadv_interface_setup);
 
         if (!soft_iface)
                 goto out;
@@ -382,8 +394,8 @@ struct net_device *softif_create(const char *name)
         atomic_set(&bat_priv->hop_penalty, 30);
         atomic_set(&bat_priv->log_level, 0);
         atomic_set(&bat_priv->fragmentation, 1);
-        atomic_set(&bat_priv->bcast_queue_left, BCAST_QUEUE_LEN);
-        atomic_set(&bat_priv->batman_queue_left, BATMAN_QUEUE_LEN);
+        atomic_set(&bat_priv->bcast_queue_left, BATADV_BCAST_QUEUE_LEN);
+        atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
 
         atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
         atomic_set(&bat_priv->bcast_seqno, 1);
@@ -399,28 +411,35 @@ struct net_device *softif_create(const char *name)
         bat_priv->primary_if = NULL;
         bat_priv->num_ifaces = 0;
 
-        ret = bat_algo_select(bat_priv, bat_routing_algo);
-        if (ret < 0)
+        bat_priv->bat_counters = __alloc_percpu(sizeof(uint64_t) * BAT_CNT_NUM,
+                                                __alignof__(uint64_t));
+        if (!bat_priv->bat_counters)
                 goto unreg_soft_iface;
 
-        ret = sysfs_add_meshif(soft_iface);
+        ret = batadv_algo_select(bat_priv, batadv_routing_algo);
         if (ret < 0)
-                goto unreg_soft_iface;
+                goto free_bat_counters;
+
+        ret = batadv_sysfs_add_meshif(soft_iface);
+        if (ret < 0)
+                goto free_bat_counters;
 
-        ret = debugfs_add_meshif(soft_iface);
+        ret = batadv_debugfs_add_meshif(soft_iface);
         if (ret < 0)
                 goto unreg_sysfs;
 
-        ret = mesh_init(soft_iface);
+        ret = batadv_mesh_init(soft_iface);
         if (ret < 0)
                 goto unreg_debugfs;
 
         return soft_iface;
 
 unreg_debugfs:
-        debugfs_del_meshif(soft_iface);
+        batadv_debugfs_del_meshif(soft_iface);
 unreg_sysfs:
-        sysfs_del_meshif(soft_iface);
+        batadv_sysfs_del_meshif(soft_iface);
+free_bat_counters:
+        free_percpu(bat_priv->bat_counters);
 unreg_soft_iface:
         unregister_netdevice(soft_iface);
         return NULL;
@@ -431,24 +450,24 @@ out:
         return NULL;
 }
 
-void softif_destroy(struct net_device *soft_iface)
+void batadv_softif_destroy(struct net_device *soft_iface)
 {
-        debugfs_del_meshif(soft_iface);
-        sysfs_del_meshif(soft_iface);
-        mesh_free(soft_iface);
+        batadv_debugfs_del_meshif(soft_iface);
+        batadv_sysfs_del_meshif(soft_iface);
+        batadv_mesh_free(soft_iface);
         unregister_netdevice(soft_iface);
 }
 
-int softif_is_valid(const struct net_device *net_dev)
+int batadv_softif_is_valid(const struct net_device *net_dev)
 {
-        if (net_dev->netdev_ops->ndo_start_xmit == interface_tx)
+        if (net_dev->netdev_ops->ndo_start_xmit == batadv_interface_tx)
                 return 1;
 
         return 0;
 }
 
 /* ethtool */
-static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         cmd->supported = 0;
         cmd->advertising = 0;
@@ -464,25 +483,73 @@ static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
         return 0;
 }
 
-static void bat_get_drvinfo(struct net_device *dev,
-                            struct ethtool_drvinfo *info)
+static void batadv_get_drvinfo(struct net_device *dev,
+                               struct ethtool_drvinfo *info)
 {
         strcpy(info->driver, "B.A.T.M.A.N. advanced");
-        strcpy(info->version, SOURCE_VERSION);
+        strcpy(info->version, BATADV_SOURCE_VERSION);
         strcpy(info->fw_version, "N/A");
         strcpy(info->bus_info, "batman");
 }
 
-static u32 bat_get_msglevel(struct net_device *dev)
+static u32 batadv_get_msglevel(struct net_device *dev)
 {
         return -EOPNOTSUPP;
 }
 
-static void bat_set_msglevel(struct net_device *dev, u32 value)
+static void batadv_set_msglevel(struct net_device *dev, u32 value)
 {
 }
 
-static u32 bat_get_link(struct net_device *dev)
+static u32 batadv_get_link(struct net_device *dev)
 {
         return 1;
 }
+
+/* Inspired by drivers/net/ethernet/dlink/sundance.c:1702
+ * Declare each description string in struct.name[] to get fixed sized buffer
+ * and compile time checking for strings longer than ETH_GSTRING_LEN.
+ */
+static const struct {
+        const char name[ETH_GSTRING_LEN];
+} batadv_counters_strings[] = {
+        { "forward" },
+        { "forward_bytes" },
+        { "mgmt_tx" },
+        { "mgmt_tx_bytes" },
+        { "mgmt_rx" },
+        { "mgmt_rx_bytes" },
+        { "tt_request_tx" },
+        { "tt_request_rx" },
+        { "tt_response_tx" },
+        { "tt_response_rx" },
+        { "tt_roam_adv_tx" },
+        { "tt_roam_adv_rx" },
+};
+
+static void batadv_get_strings(struct net_device *dev, uint32_t stringset,
+                               uint8_t *data)
+{
+        if (stringset == ETH_SS_STATS)
+                memcpy(data, batadv_counters_strings,
+                       sizeof(batadv_counters_strings));
+}
+
+static void batadv_get_ethtool_stats(struct net_device *dev,
+                                     struct ethtool_stats *stats,
+                                     uint64_t *data)
+{
+        struct bat_priv *bat_priv = netdev_priv(dev);
+        int i;
+
+        for (i = 0; i < BAT_CNT_NUM; i++)
+                data[i] = batadv_sum_counter(bat_priv, i);
+}
+
+static int batadv_get_sset_count(struct net_device *dev, int stringset)
+{
+        if (stringset == ETH_SS_STATS)
+                return BAT_CNT_NUM;
+
+        return -EOPNOTSUPP;
+}