Merge pull request #12604 from donaldsharp/distance_metric_offload_fixes

author Russ White <russ@riw.us>

Wed, 18 Jan 2023 20:57:48 +0000 (15:57 -0500)

committer GitHub <noreply@github.com>

Wed, 18 Jan 2023 20:57:48 +0000 (15:57 -0500)
author Russ White <russ@riw.us>
Wed, 18 Jan 2023 20:57:48 +0000 (15:57 -0500)
committer GitHub <noreply@github.com>
Wed, 18 Jan 2023 20:57:48 +0000 (15:57 -0500)
diff --cc zebra/rt_netlink.c
Simple merge
diff --cc zebra/rt_netlink.h
Simple merge
diff --cc zebra/zebra_rib.c
Simple merge
author	Russ White <russ@riw.us>
	Wed, 18 Jan 2023 20:57:48 +0000 (15:57 -0500)
committer	GitHub <noreply@github.com>
	Wed, 18 Jan 2023 20:57:48 +0000 (15:57 -0500)
		1	2
zebra/rt_netlink.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/rt_netlink.h	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_rib.c	patch \|	diff1 \|	diff2 \|	blob \| history