The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=90348de64067b2d006baed7cf5cb83567da2e559
commit 90348de64067b2d006baed7cf5cb83567da2e559 Author: Mark Johnston <[email protected]> AuthorDate: 2023-04-05 14:37:00 +0000 Commit: Mark Johnston <[email protected]> CommitDate: 2023-04-19 14:03:17 +0000 bridge: Try to make the GRAB_OUR_PACKETS macro a bit more readable - Let the compiler use constant folding to eliminate conditionals. - Fix some inconsistent whitespace. No functional change intended. Reviewed by: zlei MFC after: 2 weeks Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D38410 (cherry picked from commit 82bbdde4ebc9deb30d3a05ddec4d76f0a88df881) --- sys/net/if_bridge.c | 49 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 1d1e1cd20bc1..ef01be9c5b49 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -2516,32 +2516,28 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) return (m); } -#if (defined(INET) || defined(INET6)) -# define OR_CARP_CHECK_WE_ARE_DST(iface) \ - || ((iface)->if_carp \ - && (*carp_forus_p)((iface), eh->ether_dhost)) -# define OR_CARP_CHECK_WE_ARE_SRC(iface) \ - || ((iface)->if_carp \ - && (*carp_forus_p)((iface), eh->ether_shost)) +#if defined(INET) || defined(INET6) +#define CARP_CHECK_WE_ARE_DST(iface) \ + ((iface)->if_carp && (*carp_forus_p)((iface), eh->ether_dhost)) +#define CARP_CHECK_WE_ARE_SRC(iface) \ + ((iface)->if_carp && (*carp_forus_p)((iface), eh->ether_shost)) #else -# define OR_CARP_CHECK_WE_ARE_DST(iface) -# define OR_CARP_CHECK_WE_ARE_SRC(iface) +#define CARP_CHECK_WE_ARE_DST(iface) false +#define CARP_CHECK_WE_ARE_SRC(iface) false #endif #ifdef INET6 -# define OR_PFIL_HOOKED_INET6 \ - || PFIL_HOOKED_IN(V_inet6_pfil_head) +#define PFIL_HOOKED_INET6 PFIL_HOOKED_IN(V_inet6_pfil_head) #else -# define OR_PFIL_HOOKED_INET6 +#define PFIL_HOOKED_INET6 false #endif -#define GRAB_OUR_PACKETS(iface) \ - if ((iface)->if_type == IFT_GIF) \ - continue; \ - /* It is destined for us. */ \ - if (memcmp(IF_LLADDR((iface)), eh->ether_dhost, ETHER_ADDR_LEN) == 0 \ - OR_CARP_CHECK_WE_ARE_DST((iface)) \ - ) { \ +#define GRAB_OUR_PACKETS(iface) \ + if ((iface)->if_type == IFT_GIF) \ + continue; \ + /* It is destined for us. */ \ + if (memcmp(IF_LLADDR(iface), eh->ether_dhost, ETHER_ADDR_LEN) == 0 || \ + CARP_CHECK_WE_ARE_DST(iface)) { \ if (bif->bif_flags & IFBIF_LEARNING) { \ error = bridge_rtupdate(sc, eh->ether_shost, \ vlan, bif, 0, IFBAF_DYNAMIC); \ @@ -2560,8 +2556,8 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) if_inc_counter(bifp, IFCOUNTER_IPACKETS, 1); \ if_inc_counter(bifp, IFCOUNTER_IBYTES, m->m_pkthdr.len); \ /* Filter on the physical interface. */ \ - if (V_pfil_local_phys && (PFIL_HOOKED_IN(V_inet_pfil_head) \ - OR_PFIL_HOOKED_INET6)) { \ + if (V_pfil_local_phys && (PFIL_HOOKED_IN(V_inet_pfil_head) || \ + PFIL_HOOKED_INET6)) { \ if (bridge_pfil(&m, NULL, ifp, \ PFIL_IN) != 0 || m == NULL) { \ return (NULL); \ @@ -2573,9 +2569,8 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) } \ \ /* We just received a packet that we sent out. */ \ - if (memcmp(IF_LLADDR((iface)), eh->ether_shost, ETHER_ADDR_LEN) == 0 \ - OR_CARP_CHECK_WE_ARE_SRC((iface)) \ - ) { \ + if (memcmp(IF_LLADDR(iface), eh->ether_shost, ETHER_ADDR_LEN) == 0 || \ + CARP_CHECK_WE_ARE_SRC(iface)) { \ m_freem(m); \ return (NULL); \ } @@ -2599,9 +2594,9 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) GRAB_OUR_PACKETS(bif2->bif_ifp) } -#undef OR_CARP_CHECK_WE_ARE_DST -#undef OR_CARP_CHECK_WE_ARE_SRC -#undef OR_PFIL_HOOKED_INET6 +#undef CARP_CHECK_WE_ARE_DST +#undef CARP_CHECK_WE_ARE_SRC +#undef PFIL_HOOKED_INET6 #undef GRAB_OUR_PACKETS /* Perform the bridge forwarding function. */
