From ad70c4103e84f504930151e4d7bf3c71e3c2bd9d Mon Sep 17 00:00:00 2001 From: glebius Date: Tue, 18 Mar 2014 16:56:05 +0000 Subject: Merge r263091: fix mbuf flags clash that lead to failure of operation of IPSEC and packet filters. PR: kern/185876 PR: kern/186755 --- sys/netinet/ip_input.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sys/netinet/ip_input.c') diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index cde30ee..49281d5 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -707,6 +707,7 @@ ours: * ip_reass() will return a different mbuf. */ if (ip->ip_off & htons(IP_MF | IP_OFFMASK)) { + /* XXXGL: shouldn't we save & set m_flags? */ m = ip_reass(m); if (m == NULL) return; @@ -799,6 +800,8 @@ SYSCTL_PROC(_net_inet_ip, OID_AUTO, maxfragpackets, CTLTYPE_INT|CTLFLAG_RW, NULL, 0, sysctl_maxnipq, "I", "Maximum number of IPv4 fragment reassembly queue entries"); +#define M_IP_FRAG M_PROTO9 + /* * Take incoming datagram fragment and try to reassemble it into * whole datagram. If the argument is the first fragment or one -- cgit v1.1