diff options
| author | Steven Hartland <smh@FreeBSD.org> | 2015-12-16 22:26:28 +0000 |
|---|---|---|
| committer | Steven Hartland <smh@FreeBSD.org> | 2015-12-16 22:26:28 +0000 |
| commit | 3a909afe8ec9185a7af1ba94170a33f3f40c9d28 (patch) | |
| tree | 50a3f7a5d929749c70ba8b02a06c22d8388d019a /sys/netinet6/nd6_nbr.c | |
| parent | b0cd20172d854584c67cd47461a77e98b43cbcd8 (diff) | |
| download | src-3a909afe8ec9185a7af1ba94170a33f3f40c9d28.tar.gz src-3a909afe8ec9185a7af1ba94170a33f3f40c9d28.zip | |
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
Notes
Notes:
svn path=/head/; revision=292379
Diffstat (limited to 'sys/netinet6/nd6_nbr.c')
| -rw-r--r-- | sys/netinet6/nd6_nbr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 0717e1127fe9..07ad0cc71be2 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); } |