| Submitter | Marek Lindner |
|---|---|
| Date | Dec. 7, 2011, 5:36 a.m. |
| Message ID | <1323236203-24711-1-git-send-email-lindner_marek@yahoo.de> |
| Download | mbox |
| Permalink | /patch/129894/ |
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Pull-request
git://git.open-mesh.org/linux-merge.git batman-adv/maintComments
From: Marek Lindner <lindner_marek@yahoo.de> Date: Wed, 7 Dec 2011 13:36:40 +0800 > 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 Pulled, thanks. And also thanks for the heads-up about the conflicts. -- 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
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