svn commit: r356968 - head/sys/netinet6

Gleb Smirnoff glebius at FreeBSD.org
Wed Jan 22 02:35:40 UTC 2020


Author: glebius
Date: Wed Jan 22 02:35:39 2020
New Revision: 356968
URL: https://svnweb.freebsd.org/changeset/base/356968

Log:
  Unroll macro that is used just once.  Not a functional change.

Modified:
  head/sys/netinet6/ip6_mroute.c

Modified: head/sys/netinet6/ip6_mroute.c
==============================================================================
--- head/sys/netinet6/ip6_mroute.c	Wed Jan 22 02:28:39 2020	(r356967)
+++ head/sys/netinet6/ip6_mroute.c	Wed Jan 22 02:35:39 2020	(r356968)
@@ -1372,19 +1372,6 @@ ip6_mdq(struct mbuf *m, struct ifnet *ifp, struct mf6c
 	u_int32_t iszone, idzone, oszone, odzone;
 	int error = 0;
 
-/*
- * Macro to send packet on mif.  Since RSVP packets don't get counted on
- * input, they shouldn't get counted on output, so statistics keeping is
- * separate.
- */
-
-#define MC6_SEND(ip6, mifp, m) do {				\
-	if ((mifp)->m6_flags & MIFF_REGISTER)			\
-		register_send((ip6), (mifp), (m));		\
-	else							\
-		phyint_send((ip6), (mifp), (m));		\
-} while (/*CONSTCOND*/ 0)
-
 	/*
 	 * Don't forward if it didn't arrive from the parent mif
 	 * for its origin.
@@ -1528,7 +1515,10 @@ ip6_mdq(struct mbuf *m, struct ifnet *ifp, struct mf6c
 
 			mifp->m6_pkt_out++;
 			mifp->m6_bytes_out += plen;
-			MC6_SEND(ip6, mifp, m);
+			if (mifp->m6_flags & MIFF_REGISTER)
+				register_send(ip6, mifp, m);
+			else
+				phyint_send(ip6, mifp, m);
 		}
 	}
 	return (0);


More information about the svn-src-all mailing list