diff options
| author | Ondrej Filip <feela@network.cz> | 2018-02-27 06:08:03 +0100 |
|---|---|---|
| committer | Ondrej Filip <feela@network.cz> | 2018-02-27 06:08:03 +0100 |
| commit | 44062812600bd29f8edf30ebc871ff218069c5a2 (patch) | |
| tree | 656c5cfcfe340cc8a12e7a88d930cfe839f7b97e /sysdep/unix/krt.Y | |
| parent | 6f46465af1b3d21ca67e3b4379640c008fc9d1a1 (diff) | |
| parent | 1561ee799cfe79d208ce9588e487da4b62a88dad (diff) | |
Merge branch 'int-new' of ssh://gitlab.labs.nic.cz/labs/bird into int-new
Diffstat (limited to 'sysdep/unix/krt.Y')
| -rw-r--r-- | sysdep/unix/krt.Y | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/sysdep/unix/krt.Y b/sysdep/unix/krt.Y index 1cb28389..9aac8668 100644 --- a/sysdep/unix/krt.Y +++ b/sysdep/unix/krt.Y @@ -17,16 +17,6 @@ CF_DEFINES #define KIF_IFACE ((struct kif_iface_config *) this_ipatt) static void -krt_set_merge_paths(struct channel_config *cc, uint merge, uint limit) -{ - if ((limit <= 0) || (limit > 255)) - cf_error("Merge paths limit must be in range 1-255"); - - cc->ra_mode = merge ? RA_MERGED : RA_OPTIMAL; - cc->merge_limit = limit; -} - -static void kif_set_preferred(ip_addr ip) { if (ipa_is_ip4(ip)) @@ -78,10 +68,9 @@ kern_item: cf_error("Learning of kernel routes not supported on this platform"); #endif } - | DEVICE ROUTES bool { THIS_KRT->devroutes = $3; } | GRACEFUL RESTART bool { THIS_KRT->graceful_restart = $3; } | MERGE PATHS bool kern_mp_limit { - krt_set_merge_paths(this_channel, $3, $4); + THIS_KRT->merge_paths = $3 ? $4 : 0; #ifndef KRT_ALLOW_MERGE_PATHS if ($3) cf_error("Path merging not supported on this platform"); |