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, 9 insertions, 26 deletions

diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c
index ad14a6c91d6..0f65a9de5f7 100644
--- a/net/batman-adv/vis.c
+++ b/net/batman-adv/vis.c
@@ -698,15 +698,12 @@ static void batadv_purge_vis_packets(struct batadv_priv *bat_priv)
 static void batadv_broadcast_vis_packet(struct batadv_priv *bat_priv,
                                         struct batadv_vis_info *info)
 {
-        struct batadv_neigh_node *router;
         struct batadv_hashtable *hash = bat_priv->orig_hash;
         struct hlist_node *node;
         struct hlist_head *head;
         struct batadv_orig_node *orig_node;
         struct batadv_vis_packet *packet;
         struct sk_buff *skb;
-        struct batadv_hard_iface *hard_iface;
-        uint8_t dstaddr[ETH_ALEN];
         uint32_t i;
 
 
@@ -722,30 +719,20 @@ static void batadv_broadcast_vis_packet(struct batadv_priv *bat_priv,
                         if (!(orig_node->flags & BATADV_VIS_SERVER))
                                 continue;
 
-                        router = batadv_orig_node_get_router(orig_node);
-                        if (!router)
-                                continue;
-
                         /* don't send it if we already received the packet from
                          * this node.
                          */
                         if (batadv_recv_list_is_in(bat_priv, &info->recv_list,
-                                                   orig_node->orig)) {
-                                batadv_neigh_node_free_ref(router);
+                                                   orig_node->orig))
                                 continue;
-                        }
 
                         memcpy(packet->target_orig, orig_node->orig, ETH_ALEN);
-                        hard_iface = router->if_incoming;
-                        memcpy(dstaddr, router->addr, ETH_ALEN);
-
-                        batadv_neigh_node_free_ref(router);
-
                         skb = skb_clone(info->skb_packet, GFP_ATOMIC);
-                        if (skb)
-                                batadv_send_skb_packet(skb, hard_iface,
-                                                       dstaddr);
+                        if (!skb)
+                                continue;
 
+                        if (!batadv_send_skb_to_orig(skb, orig_node, NULL))
+                                kfree_skb(skb);
                 }
                 rcu_read_unlock();
         }
@@ -755,7 +742,6 @@ static void batadv_unicast_vis_packet(struct batadv_priv *bat_priv,
                                       struct batadv_vis_info *info)
 {
         struct batadv_orig_node *orig_node;
-        struct batadv_neigh_node *router = NULL;
         struct sk_buff *skb;
         struct batadv_vis_packet *packet;
 
@@ -765,17 +751,14 @@ static void batadv_unicast_vis_packet(struct batadv_priv *bat_priv,
         if (!orig_node)
                 goto out;
 
-        router = batadv_orig_node_get_router(orig_node);
-        if (!router)
+        skb = skb_clone(info->skb_packet, GFP_ATOMIC);
+        if (!skb)
                 goto out;
 
-        skb = skb_clone(info->skb_packet, GFP_ATOMIC);
-        if (skb)
-                batadv_send_skb_packet(skb, router->if_incoming, router->addr);
+        if (!batadv_send_skb_to_orig(skb, orig_node, NULL))
+                kfree_skb(skb);
 
 out:
-        if (router)
-                batadv_neigh_node_free_ref(router);
         if (orig_node)
                 batadv_orig_node_free_ref(orig_node);
 }