--- libaitio/src/bpf.c 2014/02/08 18:58:12 1.5.4.3 +++ libaitio/src/bpf.c 2014/02/08 21:33:09 1.5.4.5 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: bpf.c,v 1.5.4.3 2014/02/08 18:58:12 misho Exp $ +* $Id: bpf.c,v 1.5.4.5 2014/02/08 21:33:09 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -214,17 +214,12 @@ io_etherOpen(const char *csIface, int flags, u_int whd } n = 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 (wdlt && ioctl(eth, BIOCSDLT, &wdlt) == -1) { + if (ioctl(eth, BIOCIMMEDIATE, &n) == -1) { LOGERR; close(eth); return -1; @@ -278,6 +273,13 @@ io_etherOpen(const char *csIface, int flags, u_int whd if (ioctl(eth, BIOCSETIF, &ifr) == -1) { LOGERR; io_etherClose(eth, zcbuf); + return -1; + } + + n = wdlt; + if (wdlt && ioctl(eth, BIOCSDLT, &n) == -1) { + LOGERR; + close(eth); return -1; }