diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-05-30 17:18:46 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-05-30 17:18:46 +0200 |
| commit | 65254128e105903b6b470c6b4bb4729f56cf81bc (patch) | |
| tree | 8f0e61f94053f49428531f0d8cd6e8d1abfcdb2a /sysdep | |
| parent | 1a92ee9d4df265018c0344064019f53bc3afce3a (diff) | |
| parent | 702c04fbef222e802ca4dfac645dc75ede522db6 (diff) | |
Merge commit '702c04fbef222e802ca4dfac645dc75ede522db6' into haugesund
Diffstat (limited to 'sysdep')
| -rw-r--r-- | sysdep/bsd/krt-sock.c | 1 | ||||
| -rw-r--r-- | sysdep/linux/netlink.Y | 3 | ||||
| -rw-r--r-- | sysdep/linux/netlink.c | 1 | ||||
| -rw-r--r-- | sysdep/unix/krt.Y | 2 |
4 files changed, 1 insertions, 6 deletions
diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c index 32d38693..19ef2394 100644 --- a/sysdep/bsd/krt-sock.c +++ b/sysdep/bsd/krt-sock.c @@ -519,7 +519,6 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan) rta a = { .source = RTS_INHERIT, - .scope = SCOPE_UNIVERSE, }; /* reject/blackhole routes have also set RTF_GATEWAY, diff --git a/sysdep/linux/netlink.Y b/sysdep/linux/netlink.Y index 17e17789..7ba8c7c9 100644 --- a/sysdep/linux/netlink.Y +++ b/sysdep/linux/netlink.Y @@ -11,9 +11,6 @@ CF_HDR CF_DECLS CF_KEYWORDS(KERNEL, TABLE, METRIC, NETLINK, RX, BUFFER, - KRT_PREFSRC, KRT_REALM, KRT_SCOPE, KRT_MTU, KRT_WINDOW, - KRT_RTT, KRT_RTTVAR, KRT_SSTRESH, KRT_CWND, KRT_ADVMSS, KRT_REORDERING, - KRT_HOPLIMIT, KRT_INITCWND, KRT_RTO_MIN, KRT_INITRWND, KRT_QUICKACK, KRT_LOCK_MTU, KRT_LOCK_WINDOW, KRT_LOCK_RTT, KRT_LOCK_RTTVAR, KRT_LOCK_SSTRESH, KRT_LOCK_CWND, KRT_LOCK_ADVMSS, KRT_LOCK_REORDERING, KRT_LOCK_HOPLIMIT, KRT_LOCK_RTO_MIN, KRT_FEATURE_ECN, KRT_FEATURE_ALLFRAG) diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c index f7c5943b..2dbe59e9 100644 --- a/sysdep/linux/netlink.c +++ b/sysdep/linux/netlink.c @@ -1854,7 +1854,6 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h) rta *ra = lp_allocz(s->pool, RTA_MAX_SIZE); ra->source = RTS_INHERIT; - ra->scope = SCOPE_UNIVERSE; if (a[RTA_FLOW]) s->rta_flow = rta_get_u32(a[RTA_FLOW]); diff --git a/sysdep/unix/krt.Y b/sysdep/unix/krt.Y index 9300e9c8..4ce9a328 100644 --- a/sysdep/unix/krt.Y +++ b/sysdep/unix/krt.Y @@ -29,7 +29,7 @@ kif_set_preferred(ip_addr ip) CF_DECLS -CF_KEYWORDS(KERNEL, PERSIST, SCAN, TIME, LEARN, DEVICE, ROUTES, GRACEFUL, RESTART, KRT_SOURCE, KRT_METRIC, MERGE, PATHS) +CF_KEYWORDS(KERNEL, PERSIST, SCAN, TIME, LEARN, DEVICE, ROUTES, GRACEFUL, RESTART, MERGE, PATHS) CF_KEYWORDS(INTERFACE, PREFERRED) %type <i> kern_mp_limit |