Attachment 224416 Details for Bug 255389 – blind fix (apply via "git am")

[patch] blind fix (apply via "git am")

bug255389.diff (text/plain), 1.61 KB, created by Jan Beich on 2021-04-25 10:25:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2021-04-25 10:25:08 UTC

Size: 1.61 KB

patch

obsolete

>From 25e94c93328afbfad8e031df15c2f0a9b38fcd2e Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sun, 25 Apr 2021 10:17:47 +0000
>Subject: [PATCH] fib_algo: unbreak without INET6 in kernel config
>
>ld: error: undefined symbol: vnet_entry_inet6_dp
>>>> referenced by pcpu_aux.h:0 (sys/amd64/include/pcpu_aux.h:0)
>>>>               fib_algo.o:(fib_set_datapath_ptr)
>>>> referenced by fib_algo.c:0 (sys/net/route/fib_algo.c:0)
>>>>               fib_algo.o:(fib_select_algo_initial)
>>>> did you mean: vnet_entry_inet_dp
>>>> defined in: in_fib.o
>
>ld: error: undefined symbol: rt_get_inet6_prefix_plen
>>>> referenced by fib_algo.c:713 (sys/net/route/fib_algo.c:713)
>>>>               fib_algo.o:(queue_rtable_change)
>
>PR:		255389
>---
> sys/net/route/fib_algo.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
>diff --git a/sys/net/route/fib_algo.c b/sys/net/route/fib_algo.c
>index 43db482d73da..8c2e252166a3 100644
>--- a/sys/net/route/fib_algo.c
>+++ b/sys/net/route/fib_algo.c
>@@ -706,12 +706,16 @@ fill_change_entry(struct fib_data *fd, struct fib_change_entry *ce, struct rib_c
> 	int plen = 0;
> 
> 	switch (fd->fd_family) {
>+#ifdef INET
> 	case AF_INET:
> 		rt_get_inet_prefix_plen(rc->rc_rt, &ce->addr4, &plen, &ce->scopeid);
> 		break;
>+#endif
>+#ifdef INET6
> 	case AF_INET6:
> 		rt_get_inet6_prefix_plen(rc->rc_rt, &ce->addr6, &plen, &ce->scopeid);
> 		break;
>+#endif
> 	}
> 
> 	ce->plen = plen;
>@@ -1614,10 +1618,14 @@ static struct fib_dp **
> get_family_dp_ptr(int family)
> {
> 	switch (family) {
>+#ifdef INET
> 	case AF_INET:
> 		return (&V_inet_dp);
>+#endif
>+#ifdef INET6
> 	case AF_INET6:
> 		return (&V_inet6_dp);
>+#endif
> 	}
> 	return (NULL);
> }

Actions: View | Diff

Attachments on bug 255389: 224416