svn commit: r365554 - head/sys/net/route

Alexander V. Chernikov melifaro at FreeBSD.org
Thu Sep 10 07:05:31 UTC 2020


Author: melifaro
Date: Thu Sep 10 07:05:31 2020
New Revision: 365554
URL: https://svnweb.freebsd.org/changeset/base/365554

Log:
  Fix RADIX_MPATH build broken by r365521.
  
  Reported by:	jenkins, Hartmann, O. <ohartmann at walstatt.org>

Modified:
  head/sys/net/route/route_ctl.c

Modified: head/sys/net/route/route_ctl.c
==============================================================================
--- head/sys/net/route/route_ctl.c	Thu Sep 10 06:32:25 2020	(r365553)
+++ head/sys/net/route/route_ctl.c	Thu Sep 10 07:05:31 2020	(r365554)
@@ -577,9 +577,11 @@ rt_unlinkrte(struct rib_head *rnh, struct rt_addrinfo 
 	 */
 #ifdef RADIX_MPATH
 	info->rti_info[RTAX_GATEWAY] = &nh->gw_sa;
-	if (rt_mpath_capable(rnh))
-		rn = rt_mpath_unlink(rnh, info, rt, perror);
-	else
+	if (rt_mpath_capable(rnh)) {
+		rn = rt_mpath_unlink(rnh, info, rt, &error);
+		if (error != 0)
+			return (error);
+	} else
 #endif
 	rn = rnh->rnh_deladdr(info->rti_info[RTAX_DST],
 	    info->rti_info[RTAX_NETMASK], &rnh->head);


More information about the svn-src-all mailing list