diff options
| author | smh <smh@FreeBSD.org> | 2015-12-16 22:26:28 +0000 |
|---|---|---|
| committer | smh <smh@FreeBSD.org> | 2015-12-16 22:26:28 +0000 |
| commit | 0813e34dbc203efa23fb9ee80b8344b8cd776c67 (patch) | |
| tree | 50a3f7a5d929749c70ba8b02a06c22d8388d019a /sys/netinet6 | |
| parent | 63cd1c131acbe2c4896430de52395b168ee9b73d (diff) | |
| download | FreeBSD-src-0813e34dbc203efa23fb9ee80b8344b8cd776c67.zip FreeBSD-src-0813e34dbc203efa23fb9ee80b8344b8cd776c67.tar.gz | |
Fix issues introduced by r292275
* Fix panic for etherswitches which don't have a LLADDR.
* Disabled DELAY in unsolicited NDA, which needs further work.
* Fixed missing DELAY in carp_send_na.
* style(9) fix.
Reported by: kp & melifaro
X-MFC-With: r292275
MFC after: 1 month
Sponsored by: Multiplay
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/nd6.c | 1 | ||||
| -rw-r--r-- | sys/netinet6/nd6_nbr.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 3c048bc..d2a457d 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -209,6 +209,7 @@ nd6_ifnet_link_event(void *arg __unused, struct ifnet *ifp, int linkstate) if (linkstate == LINK_STATE_UP && V_nd6_on_link) nd6_na_output_unsolicited(ifp); } + void nd6_init(void) { diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 0717e11..07ad0cc 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -1646,7 +1646,8 @@ nd6_na_output_unsolicited(struct ifnet *ifp) i++; if (i == cnt) break; - DELAY(ann1->delay); + /* XXX DELAY needs to be done in taskqueue to avoid stalling. */ + //DELAY(ann1->delay); } free(head, M_TEMP); } |
