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 46a2b3791d9c3f7b9a2bc09b69b1a9b437977802..ab8dea8b0b2e6ae0bcf5f29e2253f0e6aa37b207 100644 (file)
--- 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);