Commit 8425ec6aea20f8c8e1783d7390f5ea6ca01c58e1
1 parent
39a3299158
batman-adv: remove useless assignment in tt_local_add()
The flag field of the tt_local_entry->common structure in
tt_local_add() is first assigned NO_FLAGS and then TT_CLIENT_NEW so
nullifying the first operation. For this reason it is safe to remove
the first assignment.
This was introuduced by ("batman-adv: keep local table consistency for
further TT_RESPONSE")
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Showing 1 changed file with 5 additions and 7 deletions Side-by-side Diff
net/batman-adv/translation-table.c
| ... | ... | @@ -305,7 +305,11 @@ |
| 305 | 305 | (uint8_t)atomic_read(&bat_priv->tt.vn)); |
| 306 | 306 | |
| 307 | 307 | memcpy(tt_local->common.addr, addr, ETH_ALEN); |
| 308 | - tt_local->common.flags = BATADV_NO_FLAGS; | |
| 308 | + /* The local entry has to be marked as NEW to avoid to send it in | |
| 309 | + * a full table response going out before the next ttvn increment | |
| 310 | + * (consistency check) | |
| 311 | + */ | |
| 312 | + tt_local->common.flags = BATADV_TT_CLIENT_NEW; | |
| 309 | 313 | if (batadv_is_wifi_iface(ifindex)) |
| 310 | 314 | tt_local->common.flags |= BATADV_TT_CLIENT_WIFI; |
| 311 | 315 | atomic_set(&tt_local->common.refcount, 2); |
| ... | ... | @@ -315,12 +319,6 @@ |
| 315 | 319 | /* the batman interface mac address should never be purged */ |
| 316 | 320 | if (batadv_compare_eth(addr, soft_iface->dev_addr)) |
| 317 | 321 | tt_local->common.flags |= BATADV_TT_CLIENT_NOPURGE; |
| 318 | - | |
| 319 | - /* The local entry has to be marked as NEW to avoid to send it in | |
| 320 | - * a full table response going out before the next ttvn increment | |
| 321 | - * (consistency check) | |
| 322 | - */ | |
| 323 | - tt_local->common.flags |= BATADV_TT_CLIENT_NEW; | |
| 324 | 322 | |
| 325 | 323 | hash_added = batadv_hash_add(bat_priv->tt.local_hash, batadv_compare_tt, |
| 326 | 324 | batadv_choose_orig, &tt_local->common, |