--- libaitio/src/bpf.c	2013/06/25 10:58:22	1.1.2.11
+++ libaitio/src/bpf.c	2013/06/26 16:34:28	1.1.2.20
@@ -122,24 +122,13 @@ io_etherOpen(const char *csIface, int flags, int whdr,
 		return -1;
 	}
 
-	if (ioctl(eth, BIOCIMMEDIATE, &n) == -1) {
-		LOGERR;
-		close(eth);
-		return -1;
-	}
-	if (whdr && ioctl(eth, BIOCSHDRCMPLT, &n) == -1) {
-		LOGERR;
-		close(eth);
-		return -1;
-	}
-
 	if (!zcbuf) {
 		if (ioctl(eth, BIOCGBLEN, &n) == -1) {
 			LOGERR;
 			close(eth);
 			return -1;
 		} else
-			n = (buflen && *buflen) ? MIN(n, *buflen) : n;
+			n = (buflen && *buflen) ? *buflen : n;
 		if (ioctl(eth, BIOCSBLEN, &n) == -1) {
 			LOGERR;
 			close(eth);
@@ -160,12 +149,12 @@ io_etherOpen(const char *csIface, int flags, int whdr,
 			close(eth);
 			return -1;
 		} else
-			n = (buflen && *buflen) ? MIN(n, *buflen) : n;
+			n = (buflen && *buflen) ? *buflen : n;
 		if (!(*zcbuf = allocZCbuf(n))) {
 			close(eth);
 			return -1;
 		}
-		if (ioctl(eth, BIOCSETZBUF, (struct bpf_zbuf*) *zcbuf) == -1) {
+		if (ioctl(eth, BIOCSETZBUF, *zcbuf) == -1) {
 			LOGERR;
 			io_etherClose(eth, zcbuf);
 			return -1;
@@ -189,6 +178,18 @@ io_etherOpen(const char *csIface, int flags, int whdr,
 		return -1;
 	}
 
+	n = 1;
+	if (whdr && ioctl(eth, BIOCSHDRCMPLT, &n) == -1) {
+		LOGERR;
+		io_etherClose(eth, zcbuf);
+		return -1;
+	}
+	if (ioctl(eth, BIOCIMMEDIATE, &n) == -1) {
+		LOGERR;
+		io_etherClose(eth, zcbuf);
+		return -1;
+	}
+
 	return eth;
 }
 
@@ -218,47 +219,46 @@ io_etherSend(int eth, const void *buf, size_t buflen)
 
 #ifdef __FreeBSD__
 static inline void
-ackZCbuf(struct bpf_zbuf_header * __restrict bzh)
+ackZCbuf(struct bpf_zbuf_header *bzh)
 {
 	atomic_store_rel_int(&bzh->bzh_user_gen, bzh->bzh_kernel_gen);
 }
 
 static inline int
-chkZCbuf(struct bpf_zbuf_header * __restrict bzh)
+chkZCbuf(struct bpf_zbuf_header *bzh)
 {
 	/* return true if userspace owns buffer, and false otherwise. */
 	return (bzh->bzh_user_gen != atomic_load_acq_int(&bzh->bzh_kernel_gen));
 }
 
-static inline ssize_t
-nextZCbuf(void ** __restrict zcache, struct bpf_zbuf * __restrict zbuf, 
-		const void * __restrict buf)
+static ssize_t
+nextZCbuf(int eth, struct bpf_zbuf * __restrict zbuf, void * __restrict buf, size_t buflen)
 {
-	ssize_t rlen = -1;
+	ssize_t rlen = 0;
+	struct bpf_zbuf bz;
 	struct bpf_zbuf_header *bzh;
+	off_t pos = 0;
 
-	if (!*zcache || *zcache == zbuf->bz_bufb) {
-		bzh = (struct bpf_zbuf_header *) zbuf->bz_bufa;
-		if (chkZCbuf(bzh)) {
-			rlen = atomic_load_acq_int(&bzh->bzh_kernel_len);
-			*zcache = zbuf->bz_bufa;
-			if (buf)
-				buf = ((caddr_t) *zcache) + sizeof(struct bpf_zbuf_header);
-			ackZCbuf(bzh);
-		} else
-			io_SetErr(EAGAIN, "kernel owns the buffer");
-	} else if (*zcache == zbuf->bz_bufa) {
-		bzh = (struct bpf_zbuf_header *) zbuf->bz_bufb;
-		if (chkZCbuf(bzh)) {
-			rlen = atomic_load_acq_int(&bzh->bzh_kernel_len);
-			*zcache = zbuf->bz_bufb;
-			if (buf)
-				buf = ((caddr_t) *zcache) + sizeof(struct bpf_zbuf_header);
-			ackZCbuf(bzh);
-		} else
-			io_SetErr(EAGAIN, "kernel owns the buffer");
+	bzh = (struct bpf_zbuf_header *) zbuf->bz_bufa;
+	if (chkZCbuf(bzh)) {
+		rlen = MIN(atomic_load_acq_int(&bzh->bzh_kernel_len), buflen);
+		memcpy(buf + pos, zbuf->bz_bufa + sizeof(struct bpf_zbuf_header), rlen);
+		ackZCbuf(bzh);
+		pos += rlen;
 	}
+	bzh = (struct bpf_zbuf_header *) zbuf->bz_bufb;
+	if (chkZCbuf(bzh)) {
+		rlen = MIN(atomic_load_acq_int(&bzh->bzh_kernel_len), buflen);
+		memcpy(buf + pos, zbuf->bz_bufb + sizeof(struct bpf_zbuf_header), rlen);
+		ackZCbuf(bzh);
+		pos += rlen;
+	}
 
+	if (!pos) {
+		if ((rlen = ioctl(eth, BIOCROTZBUF, &bz)) == -1)
+			LOGERR;
+	} else
+		rlen = pos;
 	return rlen;
 }
 #endif
@@ -276,7 +276,6 @@ ssize_t
 io_etherRecv(int eth, void * __restrict buf, size_t buflen, void * __restrict zcbuf)
 {
 	ssize_t rlen = 0;
-	void **zcache = NULL;
 
 	if (!buf || !buflen) {
 		io_SetErr(EINVAL, "invalid arguments");
@@ -289,8 +288,11 @@ io_etherRecv(int eth, void * __restrict buf, size_t bu
 			LOGERR;
 	} else {
 #ifdef __FreeBSD__
-		rlen = nextZCbuf(zcache, (struct bpf_zbuf*) zcbuf, buf);
+		rlen = nextZCbuf(eth, (struct bpf_zbuf*) zcbuf, buf, buflen);
+		if (!rlen)
+			rlen = nextZCbuf(eth, (struct bpf_zbuf*) zcbuf, buf, buflen);
 #else
+		rlen = -1;
 		io_SetErr(ENOTSUP, "bpf zero copy buffer mode is not supported");
 #endif
 	}