--- libaitio/src/bpf.c	2013/06/25 19:28:48	1.1.2.13
+++ libaitio/src/bpf.c	2013/06/26 12:27:40	1.1.2.14
@@ -122,17 +122,6 @@ 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;
@@ -189,6 +178,17 @@ io_etherOpen(const char *csIface, int flags, int whdr,
 		return -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;
 }
 
@@ -246,7 +246,7 @@ nextZCbuf(void ** __restrict zcache, struct bpf_zbuf *
 				buf = ((caddr_t) *zcache) + sizeof(struct bpf_zbuf_header);
 			ackZCbuf(bzh);
 		} else
-			io_SetErr(EAGAIN, "kernel owns the buffer");
+			io_SetErr(EAGAIN, "kernel owns the buffer A");
 	} else if (*zcache == zbuf->bz_bufa) {
 		bzh = (struct bpf_zbuf_header *) zbuf->bz_bufb;
 		if (chkZCbuf(bzh)) {
@@ -256,7 +256,7 @@ nextZCbuf(void ** __restrict zcache, struct bpf_zbuf *
 				buf = ((caddr_t) *zcache) + sizeof(struct bpf_zbuf_header);
 			ackZCbuf(bzh);
 		} else
-			io_SetErr(EAGAIN, "kernel owns the buffer");
+			io_SetErr(EAGAIN, "kernel owns the buffer B");
 	}
 
 	return rlen;
@@ -276,7 +276,7 @@ ssize_t
 io_etherRecv(int eth, void * __restrict buf, size_t buflen, void * __restrict zcbuf)
 {
 	ssize_t rlen = 0;
-	void **zcache = NULL;
+	void *zcache = NULL;
 
 	if (!buf || !buflen) {
 		io_SetErr(EINVAL, "invalid arguments");
@@ -289,7 +289,7 @@ io_etherRecv(int eth, void * __restrict buf, size_t bu
 			LOGERR;
 	} else {
 #ifdef __FreeBSD__
-		rlen = nextZCbuf(zcache, (struct bpf_zbuf*) zcbuf, buf);
+		rlen = nextZCbuf(&zcache, (struct bpf_zbuf*) zcbuf, buf);
 #else
 		io_SetErr(ENOTSUP, "bpf zero copy buffer mode is not supported");
 #endif