- Use if_broadcastaddr from struct ifnet rather than relying on

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

Reviewed by:	 imp

1 files changed, 4 insertions, 4 deletions

diff --git a/sys/netatalk/aarp.c b/sys/netatalk/aarp.c
index f2598b9..b437097 100644
--- a/sys/netatalk/aarp.c
+++ b/sys/netatalk/aarp.c
@@ -180,7 +180,7 @@ aarpwhohas( struct arpcom *ac, struct sockaddr_at *sat )
 	ea->aarp_spnode = AA_SAT( aa )->sat_addr.s_node;
 	ea->aarp_tpnode = sat->sat_addr.s_node;
     } else {
-	bcopy((caddr_t)etherbroadcastaddr, (caddr_t)eh->ether_dhost,
+	bcopy((caddr_t)ac->ac_if.if_broadcastaddr, (caddr_t)eh->ether_dhost,
 		sizeof( eh->ether_dhost ));
 	eh->ether_type = htons( ETHERTYPE_AARP );
 
@@ -221,8 +221,8 @@ aarpresolve( ac, m, destsat, desten )
 	    bcopy( (caddr_t)atmulticastaddr, (caddr_t)desten,
 		    sizeof( atmulticastaddr ));
 	} else {
-	    bcopy( (caddr_t)etherbroadcastaddr, (caddr_t)desten,
-		    sizeof( etherbroadcastaddr ));
+	    bcopy( (caddr_t)ac->ac_if.if_broadcastaddr, (caddr_t)desten,
+		    sizeof( ac->ac_if.if_addrlen ));
 	}
 	return( 1 );
     }
@@ -593,7 +593,7 @@ aarpprobe( void *arg )
 		sizeof( ea->aarp_tpnet ));
 	ea->aarp_spnode = ea->aarp_tpnode = AA_SAT( aa )->sat_addr.s_node;
     } else {
-	bcopy((caddr_t)etherbroadcastaddr, (caddr_t)eh->ether_dhost,
+	bcopy((caddr_t)ac->ac_if.if_broadcastaddr, (caddr_t)eh->ether_dhost,
 		sizeof( eh->ether_dhost ));
 	eh->ether_type = htons( ETHERTYPE_AARP );
 	ea->aarp_spa = ea->aarp_tpa = AA_SAT( aa )->sat_addr.s_node;