Staging: batman-adv: remove redundant is_my_mac() check in route_unicast_packet

Callers should check the if the received packet is for us before it
calls route_unicast_packet.

Signed-off-by: Andreas Langer <an.langer@gmx.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/batman-adv/routing.c b/drivers/staging/batman-adv/routing.c
index d36c3f9..9b61d6b 100644 (file)
--- a/drivers/staging/batman-adv/routing.c
+++ b/drivers/staging/batman-adv/routing.c
@@ -1131,12 +1131,6 @@ static int route_unicast_packet(struct sk_buff *skb,
 
        unicast_packet = (struct unicast_packet *)skb->data;
 
-       /* packet for me */
-       if (is_my_mac(unicast_packet->dest)) {
-               interface_rx(recv_if->soft_iface, skb, hdr_size);
-               return NET_RX_SUCCESS;
-       }
-
        /* TTL exceeded */
        if (unicast_packet->ttl < 2) {
                pr_debug("Warning - can't forward unicast packet from %pM to "
@@ -1170,7 +1164,6 @@ static int route_unicast_packet(struct sk_buff *skb,
                return NET_RX_DROP;
 
        unicast_packet = (struct unicast_packet *)skb->data;
-       ethhdr = (struct ethhdr *)skb_mac_header(skb);
 
        /* decrement ttl */
        unicast_packet->ttl--;