From 02721f9d9521987127126018d6239ce4f8a9d7c9 Mon Sep 17 00:00:00 2001
From: Anthony Merlino <anthony@vergeaero.com>
Date: Wed, 1 Nov 2017 06:58:33 -0600
Subject: [PATCH] net/icmpv6:  Add some header file necessary for correct
 build. drivers/wireless/ieee80211:  Fix typos and spelling errors as needed
 for Photon build.

---
 drivers/wireless/ieee80211/bcmf_netdev.c | 8 ++++----
 net/icmpv6/icmpv6_advertise.c            | 1 +
 net/icmpv6/icmpv6_solicit.c              | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/wireless/ieee80211/bcmf_netdev.c b/drivers/wireless/ieee80211/bcmf_netdev.c
index 455b15529b..cd2c919e37 100644
--- a/drivers/wireless/ieee80211/bcmf_netdev.c
+++ b/drivers/wireless/ieee80211/bcmf_netdev.c
@@ -83,10 +83,10 @@
 
 #  if defined(CONFIG_IEEE80211_BROADCOM_HPWORK)
 #    define BCMFWORK HPWORK
-#  elif defined(CONFIG_IEEE80211_BROADCOM_HLWORK)
+#  elif defined(CONFIG_IEEE80211_BROADCOM_LPWORK)
 #    define BCMFWORK LPWORK
 #  else
-#    error Neither CONFIG_IEEE80211_BROADCOM_HPWORK nor CONFIG_IEEE80211_BROADCOM_HLWORK defined
+#    error Neither CONFIG_IEEE80211_BROADCOM_HPWORK nor CONFIG_IEEE80211_BROADCOM_LPWORK defined
 #  endif
 #endif
 
@@ -926,7 +926,7 @@ static void bcmf_ipv6multicast(FAR struct bcmf_dev_s *priv)
   mac[0] = 0x33;
   mac[1] = 0x33;
 
-  dev    = &priv->dev;
+  dev    = &priv->bc_dev;
   tmp16  = dev->d_ipv6addr[6];
   mac[2] = 0xff;
   mac[3] = tmp16 >> 8;
@@ -1122,7 +1122,7 @@ int bcmf_netdev_register(FAR struct bcmf_dev_s *priv)
 
   priv->bc_txpoll        = wd_create();   /* Create periodic poll timer */
 
-  DEBUGASSERT(priv->bc_txpoll != NULL && priv->bc_txtimeout != NULL);
+  DEBUGASSERT(priv->bc_txpoll != NULL);
 
   /* Initialize network stack interface buffer */
 
diff --git a/net/icmpv6/icmpv6_advertise.c b/net/icmpv6/icmpv6_advertise.c
index 703b3718a8..37c8c8ebb9 100644
--- a/net/icmpv6/icmpv6_advertise.c
+++ b/net/icmpv6/icmpv6_advertise.c
@@ -53,6 +53,7 @@
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/icmpv6.h>
+#include <nuttx/net/ethernet.h>
 
 #include "netdev/netdev.h"
 #include "utils/utils.h"
diff --git a/net/icmpv6/icmpv6_solicit.c b/net/icmpv6/icmpv6_solicit.c
index d4a7824f77..7fa1a55d19 100644
--- a/net/icmpv6/icmpv6_solicit.c
+++ b/net/icmpv6/icmpv6_solicit.c
@@ -46,6 +46,7 @@
 #include <nuttx/net/net.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/netstats.h>
+#include <nuttx/net/ethernet.h>
 
 #include "devif/devif.h"
 #include "netdev/netdev.h"