--- libaitio/src/bpf.c	2013/12/15 22:57:20	1.5
+++ libaitio/src/bpf.c	2014/02/08 22:06:17	1.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: bpf.c,v 1.5 2013/12/15 22:57:20 misho Exp $
+* $Id: bpf.c,v 1.6 2014/02/08 22:06:17 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
@@ -114,7 +114,7 @@ io_getmaciface(const char *csIface, ether_addr_t * __r
 void
 io_etherClose(int eth, void **zcbuf)
 {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && defined(ZCBUF_ENABLE)
 	struct bpf_zbuf *zbuf = NULL;
 #endif
 
@@ -122,7 +122,7 @@ io_etherClose(int eth, void **zcbuf)
 		close(eth);
 
 	if (zcbuf && *zcbuf) {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && defined(ZCBUF_ENABLE)
 		zbuf = *zcbuf;
 		munmap(zbuf->bz_bufb, zbuf->bz_buflen);
 		munmap(zbuf->bz_bufa, zbuf->bz_buflen);
@@ -132,7 +132,7 @@ io_etherClose(int eth, void **zcbuf)
 	}
 }
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && defined(ZCBUF_ENABLE)
 static inline struct bpf_zbuf *
 allocZCbuf(u_int len)
 {
@@ -178,7 +178,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;
@@ -187,7 +187,7 @@ io_etherOpen(const char *csIface, int flags, int whdr,
 	struct ifreq ifr;
 	u_int n = 1;
 
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) || !defined(ZCBUF_ENABLE)
 	if (zcbuf) {
 		io_SetErr(ENOTSUP, "bpf zero copy buffer mode is not supported");
 		return -1;
@@ -219,11 +219,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);
@@ -246,7 +241,7 @@ io_etherOpen(const char *csIface, int flags, int whdr,
 		if (buflen)
 			*buflen = n;
 	} else {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && defined(ZCBUF_ENABLE)
 		n = BPF_BUFMODE_ZBUF;
 		if (ioctl(eth, BIOCSETBUFMODE, &n) == -1) {
 			LOGERR;
@@ -281,6 +276,13 @@ io_etherOpen(const char *csIface, int flags, int whdr,
 		return -1;
 	}
 
+	n = wdlt;
+	if (wdlt && ioctl(eth, BIOCSDLT, &n) == -1) {
+		LOGERR;
+		close(eth);
+		return -1;
+	}
+
 	return eth;
 }
 
@@ -308,7 +310,7 @@ io_etherSend(int eth, const void *buf, size_t buflen)
 	return wlen;
 }
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && defined(ZCBUF_ENABLE)
 static inline void
 ackZCbuf(struct bpf_zbuf_header *bzh)
 {
@@ -381,7 +383,7 @@ io_etherRecv(int eth, void * __restrict buf, size_t bu
 			return -1;
 		}
 	} else {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && defined(ZCBUF_ENABLE)
 		rlen = nextZCbuf(eth, (struct bpf_zbuf*) zcbuf, buf, buflen);
 		if (!rlen)
 			rlen = nextZCbuf(eth, (struct bpf_zbuf*) zcbuf, buf, buflen);