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>
This commit is contained in:
Родитель
278bc4296b
Коммит
220b07e90e
|
@ -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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче