The following commit has been merged in the master branch: commit 220b07e90e3b7b3adc60b8a72c79ad4465312072 Author: David S. Miller davem@davemloft.net Date: Fri Dec 16 15:07:28 2011 -0500
batman-adv: Fix merge error.
I didn't resolve the merge properly during the last pull of the net tree into net-next.
The code in the final resolution should set flags to TT_CLIENT_ROAM not TT_CLIENT_PENDING.
Signed-off-by: David S. Miller davem@davemloft.net
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 46a2b37..ab8dea8 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -244,7 +244,7 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr, tt_global_entry->orig_node->tt_poss_change = true; /* The global entry has to be marked as ROAMING and has to be * kept for consistency purpose */ - tt_global_entry->common.flags |= TT_CLIENT_PENDING; + tt_global_entry->common.flags |= TT_CLIENT_ROAM; tt_global_entry->roam_at = jiffies; send_roam_adv(bat_priv, tt_global_entry->common.addr, tt_global_entry->orig_node);