[src/trunk]: src/sys/net Always do the mbuf checks. The packet filters (npf) ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d1446dd2387b
branches:  trunk
changeset: 817896:d1446dd2387b
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Sep 15 14:40:43 2016 +0000

description:
Always do the mbuf checks. The packet filters (npf) expect the mbuf to be
pulled-up. (Krists Krilovs)

diffstat:

 sys/net/if_bridge.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r 368239d7cdab -r d1446dd2387b sys/net/if_bridge.c
--- a/sys/net/if_bridge.c       Thu Sep 15 09:41:33 2016 +0000
+++ b/sys/net/if_bridge.c       Thu Sep 15 14:40:43 2016 +0000
@@ -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 @@
        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;