tell ether_input() to call pf_test() outside of smr_read sections,

because smr_read sections don't play well with sleeping locks in pf(4).

OK bluhm@

1 files changed, 17 insertions, 1 deletions

diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index 703be01648f..dfd19d1432c 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bridge.c,v 1.355 2021/06/02 00:40:51 dlg Exp $	*/
+/*	$OpenBSD: if_bridge.c,v 1.356 2021/07/07 20:19:01 sashan Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -138,6 +138,8 @@ int bridge_ipsec(struct ifnet *, struct ether_header *, int, struct llc *,
 #endif
 int     bridge_clone_create(struct if_clone *, int);
 int	bridge_clone_destroy(struct ifnet *);
+void	bridge_take(void *);
+void	bridge_rele(void *);
 
 #define	ETHERADDR_IS_IP_MCAST(a) \
 	/* struct etheraddr *a;	*/				\
@@ -152,6 +154,8 @@ struct if_clone bridge_cloner =
 
 const struct ether_brport bridge_brport = {
 	bridge_input,
+	bridge_take,
+	bridge_rele,
 	NULL,
 };
 
@@ -1986,3 +1990,15 @@ bridge_send_icmp_err(struct ifnet *ifp,
  dropit:
 	m_freem(n);
 }
+
+void
+bridge_take(void *unused)
+{
+	return;
+}
+
+void
+bridge_rele(void *unused)
+{
+	return;
+}