--- libaitio/src/bpf.c	2013/06/26 13:33:55	1.1.2.16
+++ libaitio/src/bpf.c	2013/06/26 15:04:02	1.1.2.17
@@ -219,35 +219,35 @@ 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 size_t
-nextZCbuf(void ** __restrict zcache, struct bpf_zbuf * __restrict zbuf)
+static inline ssize_t
+nextZCbuf(int eth, void ** __restrict zcache, struct bpf_zbuf * __restrict zbuf)
 {
-	size_t rlen = 0;
+	ssize_t rlen = 0;
 	struct bpf_zbuf_header *bzh;
 
 	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;
+			rlen = atomic_load_acq_int(&bzh->bzh_kernel_len);
 		}
 	} 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;
+			rlen = atomic_load_acq_int(&bzh->bzh_kernel_len);
 		}
 	}
 
@@ -270,6 +270,7 @@ io_etherRecv(int eth, void * __restrict buf, size_t bu
 	ssize_t rlen = 0;
 	void *zcache = NULL;
 #ifdef __FreeBSD__
+	struct bpf_zbuf bz;
 	struct bpf_zbuf_header *bzh;
 #endif
 
@@ -284,12 +285,23 @@ io_etherRecv(int eth, void * __restrict buf, size_t bu
 			LOGERR;
 	} else {
 #ifdef __FreeBSD__
-		rlen = (ssize_t) nextZCbuf(&zcache, (struct bpf_zbuf*) zcbuf);
-		if (rlen > 0) {
-			bzh = (struct bpf_zbuf_header*) zcache;
-			memcpy(buf, zcache + sizeof(struct bpf_zbuf_header), buflen);
-			ackZCbuf(bzh);
-		}
+		do {
+			rlen = nextZCbuf(eth, &zcache, (struct bpf_zbuf*) zcbuf);
+			if (rlen > 0) {
+				bzh = (struct bpf_zbuf_header*) zcache;
+				memcpy(buf, zcache + sizeof(struct bpf_zbuf_header), 
+						MIN(buflen, rlen));
+				ackZCbuf(bzh);
+			}
+			if (!rlen && !ioctl(eth, BIOCROTZBUF, &bz)) {
+				bzh = (struct bpf_zbuf_header*) bz.bz_bufa;
+				if (bzh && chkZCbuf(bzh)) {
+					rlen = bz.bz_buflen;
+					memcpy(buf, bz.bz_bufa + sizeof(struct bpf_zbuf_header), 
+							MIN(buflen, rlen));
+				}
+			}
+		} while (0);
 #else
 		rlen = -1;
 		io_SetErr(ENOTSUP, "bpf zero copy buffer mode is not supported");