svn commit: r267728 - stable/10/sys/net

[Michael Tuexen]

Author: tuexen
Date: Sun Jun 22 16:36:14 2014
New Revision: 267728
URL: http://svnweb.freebsd.org/changeset/base/267728

Log:
  MFC r264241:
  
  Call sctp_addr_change() from rt_addrmsg() instead of rt_newaddrmsg_fib(),
  since rt_addrmsg() gets also called from other functions.

Modified:
  stable/10/sys/net/route.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/net/route.c
==============================================================================
--- stable/10/sys/net/route.c	Sun Jun 22 16:35:03 2014	(r267727)
+++ stable/10/sys/net/route.c	Sun Jun 22 16:36:14 2014	(r267728)
@@ -1780,6 +1780,16 @@ rt_addrmsg(int cmd, struct ifaddr *ifa, 
 	KASSERT(fibnum == RT_ALL_FIBS || (fibnum >= 0 && fibnum < rt_numfibs),
 	    ("%s: fib out of range 0 <=%d<%d", __func__, fibnum, rt_numfibs));
 
+#if defined(INET) || defined(INET6)
+#ifdef SCTP
+	/*
+	 * notify the SCTP stack
+	 * this will only get called when an address is added/deleted
+	 * XXX pass the ifaddr struct instead if ifa->ifa_addr...
+	 */
+	sctp_addr_change(ifa, cmd);
+#endif /* SCTP */
+#endif
 	return (rtsock_addrmsg(cmd, ifa, fibnum));
 }
 
@@ -1830,16 +1840,6 @@ rt_newaddrmsg_fib(int cmd, struct ifaddr
 	KASSERT(fibnum == RT_ALL_FIBS || (fibnum >= 0 && fibnum < rt_numfibs),
 	    ("%s: fib out of range 0 <=%d<%d", __func__, fibnum, rt_numfibs));
 
-#if defined(INET) || defined(INET6)
-#ifdef SCTP
-	/*
-	 * notify the SCTP stack
-	 * this will only get called when an address is added/deleted
-	 * XXX pass the ifaddr struct instead if ifa->ifa_addr...
-	 */
-	sctp_addr_change(ifa, cmd);
-#endif /* SCTP */
-#endif
 	if (cmd == RTM_ADD) {
 		rt_addrmsg(cmd, ifa, fibnum);
 		if (rt != NULL)