diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-07-13 12:02:34 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-07-13 12:02:34 +0200 |
| commit | 5be34f5ab4aa0c8852db6bf19cad5e81f46640e3 (patch) | |
| tree | 8a935db40e88b3e79200bc6a8b1b730ea8fe1439 /proto/babel/babel.c | |
| parent | 4ec443b5c283fc4f37629bc38ef3730e0a7cc932 (diff) | |
| parent | 7e9cede1fd1878fb4c00e793bccd0ca6c18ad452 (diff) | |
Merge commit '7e9cede1fd1878fb4c00e793bccd0ca6c18ad452' into thread-next
Diffstat (limited to 'proto/babel/babel.c')
| -rw-r--r-- | proto/babel/babel.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/proto/babel/babel.c b/proto/babel/babel.c index 4939619f..8b6abacb 100644 --- a/proto/babel/babel.c +++ b/proto/babel/babel.c @@ -315,7 +315,9 @@ babel_add_seqno_request(struct babel_proto *p, struct babel_entry *e, /* Found older */ rem_node(NODE sr); - rem_node(&sr->nbr_node); + + if (sr->nbr) + rem_node(&sr->nbr_node); goto found; } @@ -455,10 +457,7 @@ babel_flush_neighbor(struct babel_proto *p, struct babel_neighbor *nbr) struct babel_seqno_request *sr; WALK_LIST_FIRST2(sr, nbr_node, nbr->requests) - { - sr->nbr = NULL; - rem_node(&sr->nbr_node); - } + babel_remove_seqno_request(p, sr); nbr->ifa = NULL; rem_node(NODE nbr); |