diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-08-02 17:58:14 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-08-02 17:58:14 +0200 |
| commit | 0072d11f3431165240656edf6ade473554b8747e (patch) | |
| tree | 6c53bbbf0d3a4a3ad70846aae50995dc184cc5a5 /proto/static/static.h | |
| parent | 2e95d269d6bd42372d3273264e14775242b0744d (diff) | |
| parent | db9153e216b6f1847ac9cdf170b1d14c04552e41 (diff) | |
Merge branch 'ballygarvan' into HEAD
Replacing the old 3.0-alpha0 cork mechanism with another one inside the
routing table. This version should be simpler and also quite clear what
it does, why and when.
Diffstat (limited to 'proto/static/static.h')
| -rw-r--r-- | proto/static/static.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/proto/static/static.h b/proto/static/static.h index fc91f71c..ea7ca33b 100644 --- a/proto/static/static.h +++ b/proto/static/static.h @@ -9,7 +9,7 @@ #ifndef _BIRD_STATIC_H_ #define _BIRD_STATIC_H_ -#include "nest/route.h" +#include "nest/rt.h" #include "nest/bfd.h" #include "lib/buffer.h" @@ -49,7 +49,7 @@ struct static_route { byte weight; /* Multipath next hop weight */ byte use_bfd; /* Configured to use BFD */ struct bfd_request *bfd_req; /* BFD request, if BFD is used */ - mpls_label_stack *mls; /* MPLS label stack; may be NULL */ + struct adata *mls; /* MPLS label stack; may be NULL */ }; /* |