The following commit has been merged in the next branch: commit 06d0411d7a20652f54274a09c977f5a2e0c5cc9e Author: Andreas Langer an.langer@gmx.de Date: Sat Sep 25 10:06:51 2010 +0000
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
diff --git a/routing.c b/routing.c index 2d3d694..685edfd 100644 --- a/routing.c +++ b/routing.c @@ -1132,12 +1132,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 " @@ -1171,7 +1165,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--;