- Use if_broadcastaddr from struct ifnet rather than relying on

  extern 'etherbroadcastaddr'.
- Make 'etherbroadcastaddr' static.

Reviewed by:	 imp

2 files changed, 4 insertions, 3 deletions

diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h
index 227a7d2..1eb8cd8 100644
--- a/sys/net/if_arp.h
+++ b/sys/net/if_arp.h
@@ -114,8 +114,6 @@ struct	arpcom {
 	int	ac_multicnt;		/* length of ac_multiaddrs list */
 	void	*ac_netgraph;		/* ng_ether(4) netgraph node info */
 };
-
-extern u_char	etherbroadcastaddr[6];
 #endif
 
 #endif /* !_NET_IF_ARP_H_ */
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index b3751a9..8dfb5fb 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -111,9 +111,12 @@ bdg_forward_t *bdg_forward_ptr;
 bdgtakeifaces_t *bdgtakeifaces_ptr;
 struct bdg_softc *ifp2sc;
 
+static u_char etherbroadcastaddr[ETHER_ADDR_LEN] =
+			{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+
 static	int ether_resolvemulti(struct ifnet *, struct sockaddr **,
 		struct sockaddr *);
-u_char	etherbroadcastaddr[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+
 #define senderr(e) do { error = (e); goto bad;} while (0)
 #define IFP2AC(IFP) ((struct arpcom *)IFP)