Date: Tue, 3 Jun 2008 18:00:39 GMT From: Gleb Kurtsou <gk@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 142838 for review Message-ID: <200806031800.m53I0dOQ094939@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=142838 Change 142838 by gk@gk_h1 on 2008/06/03 17:59:53 fix bugs: ipfw was disabled. malloc(M_WAITOK) is ok in ipfw_*hook Affected files ... .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw_pfil.c#4 edit Differences ... ==== //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw_pfil.c#4 (text+ko) ==== @@ -547,15 +547,15 @@ struct pfil_head *pfh_inet, *pfh_ether; pfh_inet = pfil_head_get(PFIL_TYPE_AF, AF_INET); - if (pfh_inet == NULL) { + if (pfh_inet != NULL) { pfil_add_hook(ipfw_check_in, NULL, PFIL_IN | PFIL_WAITOK, pfh_inet); pfil_add_hook(ipfw_check_out, NULL, PFIL_OUT | PFIL_WAITOK, pfh_inet); } pfh_ether = pfil_head_get(PFIL_TYPE_IFT, IFT_ETHER); if (pfh_ether != NULL) { - pfil_add_hook(ipfw_ether_check_in, NULL, PFIL_IN, pfh_ether); - pfil_add_hook(ipfw_ether_check_out, NULL, PFIL_OUT, pfh_ether); + pfil_add_hook(ipfw_ether_check_in, NULL, PFIL_IN | PFIL_WAITOK, pfh_ether); + pfil_add_hook(ipfw_ether_check_out, NULL, PFIL_OUT | PFIL_WAITOK, pfh_ether); } if (pfh_inet == NULL || pfh_ether == NULL)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200806031800.m53I0dOQ094939>