From patchwork Wed Dec 7 05:36:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 129894 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 309AE1007D2 for ; Wed, 7 Dec 2011 16:37:02 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751084Ab1LGFg4 (ORCPT ); Wed, 7 Dec 2011 00:36:56 -0500 Received: from nm15-vm0.bullet.mail.ukl.yahoo.com ([217.146.183.252]:42071 "HELO nm15-vm0.bullet.mail.ukl.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1750836Ab1LGFgz (ORCPT ); Wed, 7 Dec 2011 00:36:55 -0500 Received: from [217.146.183.216] by nm15.bullet.mail.ukl.yahoo.com with NNFMP; 07 Dec 2011 05:36:54 -0000 Received: from [77.238.184.59] by tm9.bullet.mail.ukl.yahoo.com with NNFMP; 07 Dec 2011 05:36:54 -0000 Received: from [127.0.0.1] by smtp128.mail.ukl.yahoo.com with NNFMP; 07 Dec 2011 05:36:54 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1323236214; bh=wOdxM8i/yLV4yL5pYuXDHnxW5+Rr9vxDiXkwP0T5nWg=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer; b=toVEDhsQ4BgyHdUaL2aQIoHTCHEHn+ufpA/nUN9ntPQUyhsD9ljGH+yn2WEJh9nlc22896A//WF74agoneH7vqGRFVK/mV5QZvjKfmzASG9D8zgSnnRa5viTCpt5i3F2kpJiLpanSkFzhp9wrKeNh+Eg5gOTmFS+rIblmcQ8aPc= X-Yahoo-Newman-Id: 324862.14799.bm@smtp128.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: EJKJ5acVM1nz9Jkmjw1.stfwlb4HQa0MD62R_FjYWoc3AV3 K9cmZg_ANndr2dPLXJ0gC.OZ8uK0rXprRV9kG_qpjpRneU5wCmShCeBF34Va SlLLZ0esbYL7U5iK9XInSMd9nnBmt8gfHB6gK4v6Iixs6Z84lBohltIjnN8H w2_Vanx2tI4GrGRR0nNuid6whKcYBC5Ho.8G50eauy6sU8pFKsQxGSySJg9d 4SWkN7MAw6K.7_CbWVik7.Y4M55SO0mBPglbW1bsex_7HzD95cRprLiNa4ve uD9LGhKieQh2Srvt3PQF8oYpgPqcfAs3V7.Qn2zXnFETbaDwaWxNQjoi6aTo 7mXrozKCx7ScCiGvrEtrHtEE_K7WiSIzCpC6rgT2NrEET8mdNsQXuen_x2fC Xq_VvYXVveoEKLFAdMGPfEAi3B.EZgKx_dFAD_gASUxLo822QeKdTBuolq4N Jl6pK59BWyJftcA-- X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@210.177.7.38 with plain) by smtp128.mail.ukl.yahoo.com with SMTP; 07 Dec 2011 05:36:53 +0000 GMT From: Marek Lindner To: davem@davemloft.net Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org Subject: pull request: batman-adv 2011-12-07 Date: Wed, 7 Dec 2011 13:36:40 +0800 Message-Id: <1323236203-24711-1-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.5.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org David, we have to more fixes that we would like to get pulled into net-next/linux-3.2. Both patches address TT protocol misbehavior. Upon merging these patches into net-next you'll run into merge conflicts. Patch1: ++<<<<<<< + tt_global_entry->common.flags |= TT_CLIENT_PENDING; + send_roam_adv(bat_priv, tt_global_entry->common.addr, ++======= + tt_global_entry->flags |= TT_CLIENT_ROAM; + tt_global_entry->roam_at = jiffies; + + send_roam_adv(bat_priv, tt_global_entry->addr, ++>>>>>>> Resolution1: +====== tt_global_entry->common.flags |= TT_CLIENT_ROAM; tt_global_entry->roam_at = jiffies; send_roam_adv(bat_priv, tt_global_entry->common.addr, +====== Patch2: ++<<<<<<< + tt_global_entry->common.flags |= TT_CLIENT_ROAM; + tt_global_entry->roam_at = jiffies; + goto out; ++======= + /* if we are deleting a global entry due to a roam + * event, there are two possibilities: + * 1) the client roamed from node A to node B => we mark + * it with TT_CLIENT_ROAM, we start a timer and we + * wait for node B to claim it. In case of timeout + * the entry is purged. + * 2) the client roamed to us => we can directly delete + * the global entry, since it is useless now. */ + tt_local_entry = tt_local_hash_find(bat_priv, + tt_global_entry->addr); + if (!tt_local_entry) { + tt_global_entry->flags |= TT_CLIENT_ROAM; + tt_global_entry->roam_at = jiffies; + goto out; + } ++>>>>>>> Resolution2: +====== /* if we are deleting a global entry due to a roam * event, there are two possibilities: * 1) the client roamed from node A to node B => we mark * it with TT_CLIENT_ROAM, we start a timer and we * wait for node B to claim it. In case of timeout * the entry is purged. * 2) the client roamed to us => we can directly delete * the global entry, since it is useless now. */ tt_local_entry = tt_local_hash_find(bat_priv, tt_global_entry->common.addr); if (!tt_local_entry) { tt_global_entry->common.flags |= TT_CLIENT_ROAM; tt_global_entry->roam_at = jiffies; goto out; } +====== Let me know if you have any further question. Thanks, Marek The following changes since commit 1ea6b8f48918282bdca0b32a34095504ee65bab5: Linux 3.2-rc1 (2011-11-07 16:16:02 -0800) are available in the git repository at: git://git.open-mesh.org/linux-merge.git batman-adv/maint Antonio Quartulli (2): batman-adv: in case of roaming mark the client with TT_CLIENT_ROAM batman-adv: delete global entry in case of roaming net/batman-adv/translation-table.c | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html