From patchwork Thu Feb 25 06:30:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Pape X-Patchwork-Id: 15844 X-Patchwork-Delegate: mareklindner@neomailbox.ch Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [127.0.0.1]) by open-mesh.org (Postfix) with ESMTP id 16E8E818D8; Thu, 25 Feb 2016 07:30:59 +0100 (CET) Received-SPF: None (no SPF record) identity=mailfrom; client-ip=62.157.123.121; helo=mail2.phoenixcontact.com; envelope-from=apape@phoenixcontact.com; receiver=b.a.t.m.a.n@lists.open-mesh.org Authentication-Results: open-mesh.org; dmarc=none header.from=phoenixcontact.com Received: from mail2.phoenixcontact.com (mail2.phoenixcontact.com [62.157.123.121]) by open-mesh.org (Postfix) with ESMTPS id 3870B818D1 for ; Thu, 25 Feb 2016 07:30:57 +0100 (CET) Received: from localhost.localdomain ([149.208.237.66]) by de-nice01.de.phoenixcontact.com with ESMTP id 2016022507305583-8447 ; Thu, 25 Feb 2016 07:30:55 +0100 From: Andreas Pape To: b.a.t.m.a.n@lists.open-mesh.org X-Mailer: git-send-email 1.7.0.4 X-MIMETrack: Itemize by SMTP Server on DE-NICE01/Hub/SRV/DE/Phoenix Contact at 25.02.2016 07:30:55, Serialize by ntm_grab.EXE on nemex02/spoke/SRV/DE/Phoenix Contact at 25.02.2016 07:30:50, Serialize complete at 25.02.2016 07:30:50, Itemize by ntm_grab.EXE on nemex02/spoke/SRV/DE/Phoenix Contact at 25.02.2016 07:30:50, Serialize by Router on nemex02/spoke/SRV/DE/Phoenix Contact at 25.02.2016 07:30:50 X-TNEFEvaluated: 1 Message-ID: <1456381853-29832-1-git-send-email-apape@phoenixcontact.com> Date: Thu, 25 Feb 2016 07:30:53 +0100 content-transfer-encoding: quoted-printable content-type: text/plain; charset="utf-8" Subject: [B.A.T.M.A.N.] [PATCH 6/7] batman-adv: bugfix for dat optimization patch X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" Make sure that claiming of devices due to dat handling is only done for non-local mac addresses. As dat is handled after the normal bla code this should not break the roaming client scenario for dat. Signed-off-by: Andreas Pape --- net/batman-adv/bridge_loop_avoidance.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) -- 1.7.0.4 .................................................................. PHOENIX CONTACT ELECTRONICS GmbH Sitz der Gesellschaft / registered office of the company: 31812 Bad Pyrmont USt-Id-Nr.: DE811742156 Amtsgericht Hannover HRB 100528 / district court Hannover HRB 100528 Geschäftsführer / Executive Board: Roland Bent, Dr. Martin Heubeck diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 9e53fba..6311ca2 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -1956,13 +1956,19 @@ bool batadv_bla_handle_local_claim(struct batadv_priv *bat_priv, uint8_t *addr, primary_if->net_dev->dev_addr)) ret = false; } else { - /* If there is no claim, claim the device */ - batadv_dbg(BATADV_DBG_BLA, bat_priv, - "Handle claim locally for currently not claimed mac %pM.\n", - search_claim.addr); + /* If there is no claim, claim the device + * but only if this isn't a mac address + * out of the local tt + */ + if (!batadv_is_my_client(bat_priv, addr, vid)) { + batadv_dbg(BATADV_DBG_BLA, bat_priv, + "bla_handle_local_claim(): Handle claim " + "locally for currently not claimed mac %pM.\n", + search_claim.addr); - batadv_handle_claim(bat_priv, primary_if, - primary_if->net_dev->dev_addr, addr, vid); + batadv_handle_claim(bat_priv, primary_if, + primary_if->net_dev->dev_addr, addr, vid); + } } out: