1 files changed, 8 insertions, 29 deletions

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 78d657264cbf..8d64348e3cc0 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -285,7 +285,6 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv,
 {
         struct batadv_hard_iface *primary_if = NULL;
         struct batadv_orig_node *orig_node = NULL;
-        struct batadv_neigh_node *router = NULL;
         struct batadv_icmp_packet_rr *icmp_packet;
         int ret = NET_RX_DROP;
 
@@ -307,10 +306,6 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv,
         if (!orig_node)
                 goto out;
 
-        router = batadv_orig_node_get_router(orig_node);
-        if (!router)
-                goto out;
-
         /* create a copy of the skb, if needed, to modify it. */
         if (skb_cow(skb, ETH_HLEN) < 0)
                 goto out;
@@ -322,14 +317,12 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv,
         icmp_packet->msg_type = BATADV_ECHO_REPLY;
         icmp_packet->header.ttl = BATADV_TTL;
 
-        batadv_send_skb_packet(skb, router->if_incoming, router->addr);
-        ret = NET_RX_SUCCESS;
+        if (batadv_send_skb_to_orig(skb, orig_node, NULL))
+                ret = NET_RX_SUCCESS;
 
 out:
         if (primary_if)
                 batadv_hardif_free_ref(primary_if);
-        if (router)
-                batadv_neigh_node_free_ref(router);
         if (orig_node)
                 batadv_orig_node_free_ref(orig_node);
         return ret;
@@ -340,7 +333,6 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv,
 {
         struct batadv_hard_iface *primary_if = NULL;
         struct batadv_orig_node *orig_node = NULL;
-        struct batadv_neigh_node *router = NULL;
         struct batadv_icmp_packet *icmp_packet;
         int ret = NET_RX_DROP;
 
@@ -362,10 +354,6 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv,
         if (!orig_node)
                 goto out;
 
-        router = batadv_orig_node_get_router(orig_node);
-        if (!router)
-                goto out;
-
         /* create a copy of the skb, if needed, to modify it. */
         if (skb_cow(skb, ETH_HLEN) < 0)
                 goto out;
@@ -377,14 +365,12 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv,
         icmp_packet->msg_type = BATADV_TTL_EXCEEDED;
         icmp_packet->header.ttl = BATADV_TTL;
 
-        batadv_send_skb_packet(skb, router->if_incoming, router->addr);
-        ret = NET_RX_SUCCESS;
+        if (batadv_send_skb_to_orig(skb, orig_node, NULL))
+                ret = NET_RX_SUCCESS;
 
 out:
         if (primary_if)
                 batadv_hardif_free_ref(primary_if);
-        if (router)
-                batadv_neigh_node_free_ref(router);
         if (orig_node)
                 batadv_orig_node_free_ref(orig_node);
         return ret;
@@ -398,7 +384,6 @@ int batadv_recv_icmp_packet(struct sk_buff *skb,
         struct batadv_icmp_packet_rr *icmp_packet;
         struct ethhdr *ethhdr;
         struct batadv_orig_node *orig_node = NULL;
-        struct batadv_neigh_node *router = NULL;
         int hdr_size = sizeof(struct batadv_icmp_packet);
         int ret = NET_RX_DROP;
 
@@ -447,10 +432,6 @@ int batadv_recv_icmp_packet(struct sk_buff *skb,
         if (!orig_node)
                 goto out;
 
-        router = batadv_orig_node_get_router(orig_node);
-        if (!router)
-                goto out;
-
         /* create a copy of the skb, if needed, to modify it. */
         if (skb_cow(skb, ETH_HLEN) < 0)
                 goto out;
@@ -461,12 +442,10 @@ int batadv_recv_icmp_packet(struct sk_buff *skb,
         icmp_packet->header.ttl--;
 
         /* route it */
-        batadv_send_skb_packet(skb, router->if_incoming, router->addr);
-        ret = NET_RX_SUCCESS;
+        if (batadv_send_skb_to_orig(skb, orig_node, recv_if))
+                ret = NET_RX_SUCCESS;
 
 out:
-        if (router)
-                batadv_neigh_node_free_ref(router);
         if (orig_node)
                 batadv_orig_node_free_ref(orig_node);
         return ret;
@@ -882,8 +861,8 @@ static int batadv_route_unicast_packet(struct sk_buff *skb,
                            skb->len + ETH_HLEN);
 
         /* route it */
-        batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
-        ret = NET_RX_SUCCESS;
+        if (batadv_send_skb_to_orig(skb, orig_node, recv_if))
+                ret = NET_RX_SUCCESS;
 
 out:
         if (neigh_node)