Module Name: src
Committed By: christos
Date: Thu Sep 15 14:40:43 UTC 2016
Modified Files:
src/sys/net: if_bridge.c
Log Message:
Always do the mbuf checks. The packet filters (npf) expect the mbuf to be
pulled-up. (Krists Krilovs)
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sys/net/if_bridge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_bridge.c
diff -u src/sys/net/if_bridge.c:1.130 src/sys/net/if_bridge.c:1.131
--- src/sys/net/if_bridge.c:1.130 Sun Aug 28 23:31:59 2016
+++ src/sys/net/if_bridge.c Thu Sep 15 10:40:43 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridge.c,v 1.130 2016/08/29 03:31:59 ozaki-r Exp $ */
+/* $NetBSD: if_bridge.c,v 1.131 2016/09/15 14:40:43 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.130 2016/08/29 03:31:59 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.131 2016/09/15 14:40:43 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_bridge_ipf.h"
@@ -2557,13 +2557,13 @@ bridge_ipf(void *arg, struct mbuf **mp,
switch (ether_type)
{
case ETHERTYPE_IP :
- error = (dir == PFIL_IN) ? bridge_ip_checkbasic(mp) : 0;
+ error = bridge_ip_checkbasic(mp);
if (error == 0)
error = pfil_run_hooks(inet_pfil_hook, mp, ifp, dir);
break;
# ifdef INET6
case ETHERTYPE_IPV6 :
- error = (dir == PFIL_IN) ? bridge_ip6_checkbasic(mp) : 0;
+ error = bridge_ip6_checkbasic(mp);
if (error == 0)
error = pfil_run_hooks(inet6_pfil_hook, mp, ifp, dir);
break;
