D57007.1794358185.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D57007.1794358185.diff
View Options

	diff --git a/sys/net/route/nhop_ctl.c b/sys/net/route/nhop_ctl.c
	--- a/sys/net/route/nhop_ctl.c
	+++ b/sys/net/route/nhop_ctl.c
	@@ -149,13 +149,17 @@
	}

	int
	-cmp_priv(const struct nhop_priv _one, const struct nhop_priv _two)
	+cmp_priv(const struct nhop_priv key, const struct nhop_priv search)
	{

	- if (memcmp(_one->nh, _two->nh, NHOP_END_CMP) != 0)
	+ if (memcmp(key->nh, search->nh, NHOP_END_CMP) != 0)
	return (0);

	- if (memcmp(_one, _two, NH_PRIV_END_CMP) != 0)
	+ if (memcmp(key, search, NH_PRIV_END_CMP) != 0)
	+ return (0);
	+
	+ if (key->nh->nh_metric != RT_WILDCARD_METRIC &&
	+ key->nh->nh_metric != search->nh->nh_metric)
	return (0);

	return (1);
	diff --git a/sys/net/route/nhop_var.h b/sys/net/route/nhop_var.h
	--- a/sys/net/route/nhop_var.h
	+++ b/sys/net/route/nhop_var.h
	@@ -106,6 +106,6 @@
	struct nhop_priv unlink_nhop(struct nh_control ctl, struct nhop_priv *nh_priv);

	/* nhop_ctl.c */
	-int cmp_priv(const struct nhop_priv _one, const struct nhop_priv _two);
	+int cmp_priv(const struct nhop_priv key, const struct nhop_priv search);

	#endif