Author: tuexen
Date: Thu May 15 20:10:58 2014
New Revision: 266185
URL: http://svnweb.freebsd.org/changeset/base/266185

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/9/sys/net/route.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/net/   (props changed)

Modified: stable/9/sys/net/route.c
==============================================================================
--- stable/9/sys/net/route.c    Thu May 15 20:08:25 2014        (r266184)
+++ stable/9/sys/net/route.c    Thu May 15 20:10:58 2014        (r266185)
@@ -1773,6 +1773,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));
 }
 
@@ -1823,16 +1833,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)
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"

Reply via email to