--- libelwix/src/net.c	2013/07/08 01:11:34	1.6.4.1
+++ libelwix/src/net.c	2013/07/08 11:45:01	1.6.4.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: net.c,v 1.6.4.1 2013/07/08 01:11:34 misho Exp $
+* $Id: net.c,v 1.6.4.2 2013/07/08 11:45:01 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -100,7 +100,7 @@ e_link_ntoa(const struct sockaddr_dl *sdl)
  * return: NULL error or !=NULL string a
  */
 char *
-e_ether_ntoa(const struct e_ether_addr *n, char * __restrict a, int len)
+e_ether_ntoa(const ether_addr_t * __restrict n, char * __restrict a, int len)
 {
 	if (!n || !a)
 		return NULL;
@@ -122,8 +122,8 @@ e_ether_ntoa(const struct e_ether_addr *n, char * __re
  * @e = ethernet address structure, like struct ether_addr
  * return: NULL error or !=NULL ethernet address structure
  */
-struct e_ether_addr *
-e_ether_aton(const char *a, struct e_ether_addr *e)
+ether_addr_t *
+e_ether_aton(const char *a, ether_addr_t * __restrict e)
 {                       
 	int i;
 	u_int o0, o1, o2, o3, o4, o5;
@@ -462,8 +462,8 @@ e_ether_addr(const char *ifname, ether_addr_t * __rest
 		memset(a, 0, sizeof(ether_addr_t));
 
 	getifaddrs(&ifa);
-	for (p = ifa; p; p++)
-		if (!strcmp(p->ifa_name, ifname) && p->ifa_addr && 
+	for (p = ifa; p && p->ifa_name; p++)
+		if (p->ifa_name && !strcmp(p->ifa_name, ifname) && p->ifa_addr && 
 				p->ifa_addr->sa_family == AF_LINK) {
 			memcpy(a, LLADDR((struct sockaddr_dl*) p->ifa_addr), sizeof(ether_addr_t));
 			break;