summaryrefslogtreecommitdiffstats
path: root/sys/net
diff options
context:
space:
mode:
authortuexen <tuexen@FreeBSD.org>2014-06-22 16:36:14 +0000
committertuexen <tuexen@FreeBSD.org>2014-06-22 16:36:14 +0000
commit493873a6efe2361a2d7d86dfb3bb29b3e72c5302 (patch)
tree20d675f45f7c93f6f27bbaf11f310f246d7b2040 /sys/net
parentde3cc217068972b5c1d3f0f0e052f7efcd40f65f (diff)
downloadFreeBSD-src-493873a6efe2361a2d7d86dfb3bb29b3e72c5302.zip
FreeBSD-src-493873a6efe2361a2d7d86dfb3bb29b3e72c5302.tar.gz
MFC r264241:
Call sctp_addr_change() from rt_addrmsg() instead of rt_newaddrmsg_fib(), since rt_addrmsg() gets also called from other functions.
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/route.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/net/route.c b/sys/net/route.c
index 4182c85..ac8fe96 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1780,6 +1780,16 @@ rt_addrmsg(int cmd, struct ifaddr *ifa, int fibnum)
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 *ifa, int error, struct rtentry *rt,
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)
OpenPOWER on IntegriCloud