batman-adv: Add wrapper to look up neighbor and send skb

By adding batadv_send_skb_to_orig() in send.c, we can remove duplicate
code that looks up the next hop and then calls batadv_send_skb_packet().

Furthermore, this prepares the upcoming new implementation of
fragmentation, which requires the next hop to route packets.

Please note that this doesn't entirely remove the next-hop lookup in
routing.c and unicast.c, since it is used by the current fragmentation
code.

Also note that the next-hop info is removed from debug messages in
translation-table.c, since it is looked up elsewhere.

Signed-off-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
index c9a1f6523c36..10aff49fcf25 100644
--- a/net/batman-adv/unicast.c
+++ b/net/batman-adv/unicast.c
@@ -402,7 +402,7 @@ int batadv_unicast_generic_send_skb(struct batadv_priv *bat_priv,
         struct batadv_orig_node *orig_node;
         struct batadv_neigh_node *neigh_node;
         int data_len = skb->len;
-        int ret = 1;
+        int ret = NET_RX_DROP;
         unsigned int dev_mtu;
 
         /* get routing information */
@@ -466,15 +466,15 @@ find_router:
                 goto out;
         }
 
-        batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
-        ret = 0;
+        if (batadv_send_skb_to_orig(skb, orig_node, NULL))
+                ret = 0;
 
 out:
         if (neigh_node)
                 batadv_neigh_node_free_ref(neigh_node);
         if (orig_node)
                 batadv_orig_node_free_ref(orig_node);
-        if (ret == 1)
+        if (ret == NET_RX_DROP)
                 kfree_skb(skb);
         return ret;
 }