Fix the build with INVARIANTS.

MFC after:	1 month
This commit is contained in:
Andrey V. Elsukov 2019-01-10 02:01:20 +00:00
parent 1cdf23bc03
commit 3b1522c229
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=342909

View File

@ -257,7 +257,7 @@ ipfw_check_packet(void *arg, struct mbuf **m0, struct ifnet *ifp, int dir,
ret = EACCES;
if (ip_dn_io_ptr == NULL)
break; /* i.e. drop */
MPASS(args->flags & IPFW_ARGS_REF);
MPASS(args.flags & IPFW_ARGS_REF);
if (mtod(*m0, struct ip *)->ip_v == 4)
ret = ip_dn_io_ptr(m0, dir, &args);
else if (mtod(*m0, struct ip *)->ip_v == 6)
@ -281,7 +281,7 @@ ipfw_check_packet(void *arg, struct mbuf **m0, struct ifnet *ifp, int dir,
ret = EACCES;
break; /* i.e. drop */
}
MPASS(args->flags & IPFW_ARGS_REF);
MPASS(args.flags & IPFW_ARGS_REF);
ret = ipfw_divert(m0, dir, &args.rule,
(ipfw == IP_FW_TEE) ? 1 : 0);
/* continue processing for the original packet (tee). */
@ -295,7 +295,7 @@ ipfw_check_packet(void *arg, struct mbuf **m0, struct ifnet *ifp, int dir,
ret = EACCES;
break; /* i.e. drop */
}
MPASS(args->flags & IPFW_ARGS_REF);
MPASS(args.flags & IPFW_ARGS_REF);
ret = ng_ipfw_input_p(m0, dir, &args,
(ipfw == IP_FW_NGTEE) ? 1 : 0);
if (ipfw == IP_FW_NGTEE) /* ignore errors for NGTEE */
@ -406,7 +406,7 @@ ipfw_check_frame(void *arg, struct mbuf **m0, struct ifnet *ifp, int dir,
*m0 = NULL;
dir = (dir == PFIL_IN) ? DIR_IN : DIR_OUT;
MPASS(args->flags & IPFW_ARGS_REF);
MPASS(args.flags & IPFW_ARGS_REF);
ip_dn_io_ptr(&m, dir | PROTO_LAYER2, &args);
return 0;
@ -416,7 +416,7 @@ ipfw_check_frame(void *arg, struct mbuf **m0, struct ifnet *ifp, int dir,
ret = EACCES;
break; /* i.e. drop */
}
MPASS(args->flags & IPFW_ARGS_REF);
MPASS(args.flags & IPFW_ARGS_REF);
ret = ng_ipfw_input_p(m0, (dir == PFIL_IN) ? DIR_IN : DIR_OUT,
&args, (i == IP_FW_NGTEE) ? 1 : 0);
if (i == IP_FW_NGTEE) /* ignore errors for NGTEE */