From 3a909afe8ec9185a7af1ba94170a33f3f40c9d28 Mon Sep 17 00:00:00 2001
From: Steven Hartland <smh@FreeBSD.org>
Date: Wed, 16 Dec 2015 22:26:28 +0000
Subject: [PATCH] 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
---
 sys/netinet/if_ether.c | 11 +++++++----
 sys/netinet/ip_carp.c  |  2 +-
 sys/netinet6/nd6.c     |  1 +
 sys/netinet6/nd6_nbr.c |  3 ++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index ce1487fad2d6..6ca484489cd6 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -1217,7 +1217,8 @@ arp_announce(struct ifnet *ifp)
 	struct ifaddr *ifa;
 	struct in_addr *addr, *head;
 
-	if (!(ifp->if_flags & IFF_UP) || (ifp->if_flags & IFF_NOARP))
+	if (!(ifp->if_flags & IFF_UP) || (ifp->if_flags & IFF_NOARP) ||
+	    ifp->if_addr == NULL)
 		return;
 
 	entries = 8;
@@ -1254,9 +1255,11 @@ arp_announce(struct ifnet *ifp)
 	}
 	IF_ADDR_RUNLOCK(ifp);
 
-	lladdr = IF_LLADDR(ifp);
-	for (i = 0; i < cnt; i++) {
-		arp_announce_addr(ifp, head + i, lladdr);
+	if (cnt > 0) {
+		lladdr = IF_LLADDR(ifp);
+		for (i = 0; i < cnt; i++) {
+			arp_announce_addr(ifp, head + i, lladdr);
+		}
 	}
 	free(head, M_TEMP);
 }
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index 6989da29450e..da0ceabfa305 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1045,7 +1045,7 @@ carp_send_na(struct carp_softc *sc)
 
 		nd6_na_output_unsolicited_addr(sc->sc_carpdev, IFA_IN6(ifa),
 		    IFA_ND6_NA_BASE_FLAGS(sc->sc_carpdev, ifa));
-		nd6_na_unsolicited_addr_delay(ifa);
+		DELAY(nd6_na_unsolicited_addr_delay(ifa));
 	}
 }
 
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 3c048bc6f377..d2a457db62e0 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 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);
 }