diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-16 15:07:28 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-16 15:07:28 -0500 |
| commit | 220b07e90e3b7b3adc60b8a72c79ad4465312072 (patch) | |
| tree | 06421abf3e8976395e37f2d42ae4c2e0f6662ec8 /net/batman-adv | |
| parent | 278bc4296bd64ffd1d3913b487dc8a520e423a7a (diff) | |
| download | linux-220b07e90e3b7b3adc60b8a72c79ad4465312072.tar.bz2 | |
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>
Diffstat (limited to 'net/batman-adv')
| -rw-r--r-- | net/batman-adv/translation-table.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 46a2b3791d9c..ab8dea8b0b2e 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); |