--- libaitio/src/bpf.c	2013/12/15 22:57:20	1.5
+++ libaitio/src/bpf.c	2014/02/02 12:27:38	1.5.4.1
@@ -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.5.4.1 2014/02/02 12:27:38 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -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)
 {
@@ -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;
@@ -246,7 +246,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;
@@ -308,7 +308,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 +381,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);