aboutsummaryrefslogtreecommitdiff
path: root/sys/netinet/in_gif.c
diff options
context:
space:
mode:
authorGleb Smirnoff <glebius@FreeBSD.org>2020-01-15 05:45:27 +0000
committerGleb Smirnoff <glebius@FreeBSD.org>2020-01-15 05:45:27 +0000
commit97168be809a33a1e85556765b458692afddfe690 (patch)
tree9c2359f912256faa78f51b9033a14e947cec65dd /sys/netinet/in_gif.c
parentfae994f63693a9ededce96622067a98a546847cb (diff)
downloadsrc-97168be809a33a1e85556765b458692afddfe690.tar.gz
src-97168be809a33a1e85556765b458692afddfe690.zip
Mechanically substitute assertion of in_epoch(net_epoch_preempt) to
NET_EPOCH_ASSERT(). NFC
Notes
Notes: svn path=/head/; revision=356753
Diffstat (limited to 'sys/netinet/in_gif.c')
-rw-r--r--sys/netinet/in_gif.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index 9cb8d280e775..b1167054cb08 100644
--- a/sys/netinet/in_gif.c
+++ b/sys/netinet/in_gif.c
@@ -152,7 +152,7 @@ in_gif_srcaddr(void *arg __unused, const struct sockaddr *sa,
if (V_ipv4_hashtbl == NULL)
return;
- MPASS(in_epoch(net_epoch_preempt));
+ NET_EPOCH_ASSERT();
sin = (const struct sockaddr_in *)sa;
CK_LIST_FOREACH(sc, &GIF_SRCHASH(sin->sin_addr.s_addr), srchash) {
if (sc->gif_iphdr->ip_src.s_addr != sin->sin_addr.s_addr)
@@ -275,7 +275,7 @@ in_gif_output(struct ifnet *ifp, struct mbuf *m, int proto, uint8_t ecn)
int len;
/* prepend new IP header */
- MPASS(in_epoch(net_epoch_preempt));
+ NET_EPOCH_ASSERT();
len = sizeof(struct ip);
#ifndef __NO_STRICT_ALIGNMENT
if (proto == IPPROTO_ETHERIP)
@@ -314,7 +314,7 @@ in_gif_input(struct mbuf *m, int off, int proto, void *arg)
struct ip *ip;
uint8_t ecn;
- MPASS(in_epoch(net_epoch_preempt));
+ NET_EPOCH_ASSERT();
if (sc == NULL) {
m_freem(m);
KMOD_IPSTAT_INC(ips_nogif);
@@ -343,7 +343,7 @@ in_gif_lookup(const struct mbuf *m, int off, int proto, void **arg)
if (V_ipv4_hashtbl == NULL)
return (0);
- MPASS(in_epoch(net_epoch_preempt));
+ NET_EPOCH_ASSERT();
ip = mtod(m, const struct ip *);
/*
* NOTE: it is safe to iterate without any locking here, because softc