batman-adv: Move call to batadv_nc_skb_forward() from routing.c to send.c

The call to batadv_nc_skb_forward() fits better in
batadv_send_skb_to_orig(), as this is where the actual next hop is
looked up.

To let the caller of batadv_send_skb_to_orig() know wether the skb is
transmitted, buffered or failed, the return value is changed from
boolean to int.

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, 3 deletions

diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c
index 94eaeb521c17..4983340f1943 100644
--- a/net/batman-adv/vis.c
+++ b/net/batman-adv/vis.c
@@ -697,7 +697,7 @@ static void batadv_broadcast_vis_packet(struct batadv_priv *bat_priv,
         struct batadv_orig_node *orig_node;
         struct batadv_vis_packet *packet;
         struct sk_buff *skb;
-        uint32_t i;
+        uint32_t i, res;
 
 
         packet = (struct batadv_vis_packet *)info->skb_packet->data;
@@ -724,7 +724,8 @@ static void batadv_broadcast_vis_packet(struct batadv_priv *bat_priv,
                         if (!skb)
                                 continue;
 
-                        if (!batadv_send_skb_to_orig(skb, orig_node, NULL))
+                        res = batadv_send_skb_to_orig(skb, orig_node, NULL);
+                        if (res == NET_XMIT_DROP)
                                 kfree_skb(skb);
                 }
                 rcu_read_unlock();
@@ -748,7 +749,7 @@ static void batadv_unicast_vis_packet(struct batadv_priv *bat_priv,
         if (!skb)
                 goto out;
 
-        if (!batadv_send_skb_to_orig(skb, orig_node, NULL))
+        if (batadv_send_skb_to_orig(skb, orig_node, NULL) == NET_XMIT_DROP)
                 kfree_skb(skb);
 
 out: