diff options
| author | Renato Westphal <renato@opensourcerouting.org> | 2019-03-02 15:00:46 -0300 |
|---|---|---|
| committer | Renato Westphal <renatowestphal@gmail.com> | 2019-03-29 11:32:21 -0300 |
| commit | 8f88441d717c0ded412543cceabf0ddd93ee9f09 (patch) | |
| tree | 0a460d2da46a5b910535529c92e8db2fa5ff2a74 /ripngd/ripngd.h | |
| parent | 6a534dcafcb623f1b85b5ee2a13c74faab227ced (diff) | |
| parent | 700e9faa28bbdc3460e1d7aa109b6e4acaf347b3 (diff) | |
Merge remote-tracking branch 'frr/master' into rip-vrf
Merge commit to solve a bunch of conflicts with other PRs that were
merged in the previous weeks.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Diffstat (limited to 'ripngd/ripngd.h')
| -rw-r--r-- | ripngd/ripngd.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ripngd/ripngd.h b/ripngd/ripngd.h index b38e6b3a95..dcc61ae58a 100644 --- a/ripngd/ripngd.h +++ b/ripngd/ripngd.h @@ -162,6 +162,9 @@ struct ripng { /* For distribute-list container */ struct distribute_ctx *distribute_ctx; + + /* For if_rmap container */ + struct if_rmap_ctx *if_rmap_ctx; }; RB_HEAD(ripng_instance_head, ripng); RB_PROTOTYPE(ripng_instance_head, ripng, entry, ripng_instance_compare) |