Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 220b07e9 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parent 278bc429

net/batman-adv/translation-table.c

+1 −1
Original line number Diff line number Diff line
@@ -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);