aboutsummaryrefslogtreecommitdiff
path: root/sys/netinet6
diff options
context:
space:
mode:
authorGleb Smirnoff <glebius@FreeBSD.org>2020-01-22 02:35:39 +0000
committerGleb Smirnoff <glebius@FreeBSD.org>2020-01-22 02:35:39 +0000
commitf6a2a6b163f9921c390b9ece9f46dda0500274d2 (patch)
treeb091251a51b7839789537a680ad687e36c7c9d78 /sys/netinet6
parent1d11092814b84f7f8dce47777d4c1e1327db46dd (diff)
Notes
Diffstat (limited to 'sys/netinet6')
-rw-r--r--sys/netinet6/ip6_mroute.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index 82ca908d4553e..4a73d5f114703 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -1372,19 +1372,6 @@ ip6_mdq(struct mbuf *m, struct ifnet *ifp, struct mf6c *rt)
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 *rt)
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);