From patchwork Thu Sep 16 22:00:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Langer X-Patchwork-Id: 426 Return-Path: Received: from mail.gmx.net (mailout-de.gmx.net [213.165.64.22]) by open-mesh.org (Postfix) with SMTP id 5A0D215444C for ; Fri, 17 Sep 2010 00:00:44 +0200 (CEST) Received: (qmail invoked by alias); 16 Sep 2010 22:00:43 -0000 Received: from 91-65-48-151-dynip.superkabel.de (EHLO localhost) [91.65.48.151] by mail.gmx.net (mp072) with SMTP; 17 Sep 2010 00:00:43 +0200 X-Authenticated: #9260637 X-Provags-ID: V01U2FsdGVkX1/fyfI9Jo3f+U4FlQoFCsNbr4Yp4M50sXLMFo5j4E /1axSIVlAeK4uH From: Andreas Langer To: b.a.t.m.a.n@lists.open-mesh.org Date: Fri, 17 Sep 2010 00:00:08 +0200 Message-Id: <1284674410-15477-4-git-send-email-an.langer@gmx.de> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <20100916235908.51ab3bfc@rechenknecht> References: <20100916235908.51ab3bfc@rechenknecht> X-Y-GMX-Trusted: 0 Subject: [B.A.T.M.A.N.] [PATCH 4/6] batman-adv:remove redundant is_my_mac() check in route_unicast_packet - callers deal with it X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2010 22:00:44 -0000 Signed-off-by: Andreas Langer --- batman-adv/routing.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/batman-adv/routing.c b/batman-adv/routing.c index c1e32e6..5d17597 100644 --- a/batman-adv/routing.c +++ b/batman-adv/routing.c @@ -1145,12 +1145,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 " @@ -1184,7 +1178,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--;