--- libaitio/src/bpf.c	2014/02/02 12:27:38	1.5.4.1
+++ libaitio/src/bpf.c	2014/11/17 22:28:01	1.6.6.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: bpf.c,v 1.5.4.1 2014/02/02 12:27:38 misho Exp $
+* $Id: bpf.c,v 1.6.6.1 2014/11/17 22:28:01 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+Copyright 2004 - 2014
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -47,27 +47,6 @@ SUCH DAMAGE.
 
 
 /*
- * io_get1stiface() - Get first interface of host
- *
- * @szIface = interface string buffer
- * @iflen = size of interface buffer
- * return: -1 error or 0 ok
- */
-int
-io_get1stiface(char *szIface, int iflen)
-{
-	struct ifaddrs *ifa;
-
-	if (!szIface || !iflen)
-		return -1;
-
-	getifaddrs(&ifa);
-	strlcpy(szIface, ifa->ifa_name, iflen);
-	freeifaddrs(ifa);
-	return 0;
-}
-
-/*
  * io_getmaciface() - Get MAC address from interface name
  *
  * @csIface = interface name
@@ -178,7 +157,7 @@ allocZCbuf(u_int len)
  * return: -1 error or >-1 bpf handle
  */
 int
-io_etherOpen(const char *csIface, int flags, int whdr, int wdlt, 
+io_etherOpen(const char *csIface, int flags, u_int whdr, u_int wdlt, 
 		u_int *buflen, void **zcbuf)
 {
 	int eth = -1;
@@ -219,11 +198,6 @@ io_etherOpen(const char *csIface, int flags, int whdr,
 		close(eth);
 		return -1;
 	}
-	if (wdlt && ioctl(eth, BIOCSDLT, &wdlt) == -1) {
-		LOGERR;
-		close(eth);
-		return -1;
-	}
 	if (ioctl(eth, BIOCIMMEDIATE, &n) == -1) {
 		LOGERR;
 		close(eth);
@@ -278,6 +252,13 @@ io_etherOpen(const char *csIface, int flags, int whdr,
 	if (ioctl(eth, BIOCSETIF, &ifr) == -1) {
 		LOGERR;
 		io_etherClose(eth, zcbuf);
+		return -1;
+	}
+
+	n = wdlt;
+	if (wdlt && ioctl(eth, BIOCSDLT, &n) == -1) {
+		LOGERR;
+		close(eth);
 		return -1;
 	}