Staging: batman-adv: refactoring unicast payload code

[firefly-linux-kernel-4.4.55.git] / drivers / staging / batman-adv / soft-interface.c

diff --git a/drivers/staging/batman-adv/soft-interface.c b/drivers/staging/batman-adv/soft-interface.c
index 6f22e6ec05d89a4d45862f1e27cdb7638384e759..315fdeb38cf58d0ddcdc78c051a42fce3dd213fb 100644 (file)
--- a/drivers/staging/batman-adv/soft-interface.c
+++ b/drivers/staging/batman-adv/soft-interface.c
@@ -22,14 +22,12 @@
 #include "main.h"
 #include "soft-interface.h"
 #include "hard-interface.h"
-#include "routing.h"
-#include "send.h"
 #include "translation-table.h"
-#include "types.h"
-#include "hash.h"
+#include "send.h"
 #include <linux/slab.h>
 #include <linux/ethtool.h>
 #include <linux/etherdevice.h>
+#include "unicast.h"
 
 static uint32_t bcast_seqno = 1; /* give own bcast messages seq numbers to avoid
                                  * broadcast storms */
@@ -127,24 +125,14 @@ static int interface_change_mtu(struct net_device *dev, int new_mtu)
 
 int interface_tx(struct sk_buff *skb, struct net_device *dev)
 {
-       struct unicast_packet *unicast_packet;
-       struct bcast_packet *bcast_packet;
-       struct orig_node *orig_node;
-       struct neigh_node *router;
        struct ethhdr *ethhdr = (struct ethhdr *)skb->data;
-       struct bat_priv *priv = netdev_priv(dev);
-       struct batman_if *batman_if;
-       struct bat_priv *bat_priv;
-       uint8_t dstaddr[6];
-       int data_len = skb->len;
-       unsigned long flags;
+       struct bat_priv *bat_priv = netdev_priv(dev);
+       struct bcast_packet *bcast_packet;
+       int data_len = skb->len, ret;
 
        if (atomic_read(&module_state) != MODULE_ACTIVE)
                goto dropped;
 
-       /* FIXME: each batman_if will be attached to a softif */
-       bat_priv = netdev_priv(soft_device);
-
        dev->trans_start = jiffies;
        /* TODO: check this for locks */
        hna_local_add(ethhdr->h_source);
@@ -179,55 +167,19 @@ int interface_tx(struct sk_buff *skb, struct net_device *dev)
 
        /* unicast packet */
        } else {
-               spin_lock_irqsave(&orig_hash_lock, flags);
-               /* get routing information */
-               orig_node = ((struct orig_node *)hash_find(orig_hash,
-                                                          ethhdr->h_dest));
-
-               /* check for hna host */
-               if (!orig_node)
-                       orig_node = transtable_search(ethhdr->h_dest);
-
-               router = find_router(orig_node, NULL);
-
-               if (!router)
-                       goto unlock;
-
-               /* don't lock while sending the packets ... we therefore
-                * copy the required data before sending */
-
-               batman_if = router->if_incoming;
-               memcpy(dstaddr, router->addr, ETH_ALEN);
-
-               spin_unlock_irqrestore(&orig_hash_lock, flags);
-
-               if (batman_if->if_status != IF_ACTIVE)
-                       goto dropped;
-
-               if (my_skb_push(skb, sizeof(struct unicast_packet)) < 0)
-                       goto dropped;
-
-               unicast_packet = (struct unicast_packet *)skb->data;
-
-               unicast_packet->version = COMPAT_VERSION;
-               /* batman packet type: unicast */
-               unicast_packet->packet_type = BAT_UNICAST;
-               /* set unicast ttl */
-               unicast_packet->ttl = TTL;
-               /* copy the destination for faster routing */
-               memcpy(unicast_packet->dest, orig_node->orig, ETH_ALEN);
-
-               send_skb_packet(skb, batman_if, dstaddr);
+               ret = unicast_send_skb(skb, bat_priv);
+               if (ret != 0) {
+                       bat_priv->stats.tx_dropped++;
+                       goto end;
+               }
        }
 
-       priv->stats.tx_packets++;
-       priv->stats.tx_bytes += data_len;
+       bat_priv->stats.tx_packets++;
+       bat_priv->stats.tx_bytes += data_len;
        goto end;
 
-unlock:
-       spin_unlock_irqrestore(&orig_hash_lock, flags);
 dropped:
-       priv->stats.tx_dropped++;
+       bat_priv->stats.tx_dropped++;
        kfree_skb(skb);
 end:
        return NETDEV_TX_OK;