diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2012-01-24 11:31:00 +0100 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2012-01-24 11:31:00 +0100 |
| commit | 39c028e9e9e3acf840051f4271fadd4939fde2af (patch) | |
| tree | d6ca0ff9816965b31cb2ee4794c1a1c65a427f7d /sysdep | |
| parent | 09686693d35bd71187847c95c0967d4125215b97 (diff) | |
Assign default protocol preference via proto_config_new().
The patch from Alexander V. Chernikov.
Diffstat (limited to 'sysdep')
| -rw-r--r-- | sysdep/unix/krt.Y | 2 | ||||
| -rw-r--r-- | sysdep/unix/krt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sysdep/unix/krt.Y b/sysdep/unix/krt.Y index 86081966..18e1e52d 100644 --- a/sysdep/unix/krt.Y +++ b/sysdep/unix/krt.Y @@ -31,7 +31,6 @@ kern_proto_start: proto_start KERNEL { cf_error("Kernel protocol already defined"); #endif cf_krt = this_proto = proto_config_new(&proto_unix_kernel, sizeof(struct krt_config), $1); - this_proto->preference = DEF_PREF_INHERITED; THIS_KRT->scan_time = 60; THIS_KRT->learn = THIS_KRT->persist = 0; krt_scan_construct(THIS_KRT); @@ -67,7 +66,6 @@ kif_proto_start: proto_start DEVICE { if (cf_kif) cf_error("Kernel device protocol already defined"); cf_kif = this_proto = proto_config_new(&proto_unix_iface, sizeof(struct kif_config), $1); - this_proto->preference = DEF_PREF_DIRECT; THIS_KIF->scan_time = 60; init_list(&THIS_KIF->primary); krt_if_construct(THIS_KIF); diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c index ad8ea6b6..231c5fcf 100644 --- a/sysdep/unix/krt.c +++ b/sysdep/unix/krt.c @@ -243,6 +243,7 @@ kif_copy_config(struct proto_config *dest, struct proto_config *src) struct protocol proto_unix_iface = { name: "Device", template: "device%d", + preference: DEF_PREF_DIRECT, preconfig: kif_preconfig, init: kif_init, start: kif_start, @@ -968,6 +969,7 @@ struct protocol proto_unix_kernel = { name: "Kernel", template: "kernel%d", attr_class: EAP_KRT, + preference: DEF_PREF_INHERITED, preconfig: krt_preconfig, postconfig: krt_postconfig, init: krt_init, |