The following commit has been merged in the master branch: commit 6981e95f7283295a44b9cd505d5c0fd1b383c2bb Author: Andreas Langer <an.langer at gmx.de> Date: Sat Sep 25 10:06:51 2010 +0000

batman-adv:remove redundant is_my_mac() check in route_unicast_packet - callers deal with it

Signed-off-by: Andreas Langer <an.langer at gmx.de>

diff --git a/routing.c b/routing.c index 6f8d13a..e566a32 100644 --- a/routing.c +++ b/routing.c @@ -1147,12 +1147,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 " @@ -1186,7 +1180,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--;