Patchwork batman-adv: Fix merge error.

login
register
mail settings
Submitter David Miller
Date Dec. 16, 2011, 8:09 p.m.
Message ID <20111216.150906.1619202587161062277.davem@davemloft.net>
Download mbox | patch
Permalink /patch/131894/
State Accepted
Delegated to: David Miller
Headers show

Comments

David Miller - Dec. 16, 2011, 8:09 p.m.
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>
---
 net/batman-adv/translation-table.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

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);