Module Name: src
Committed By: maxv
Date: Thu May 31 13:51:57 UTC 2018
Modified Files:
src/sys/netinet: udp_usrreq.c
Log Message:
Remove the non-IKE part of the computation, too.
To generate a diff of this commit:
cvs rdiff -u -r1.253 -r1.254 src/sys/netinet/udp_usrreq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/udp_usrreq.c
diff -u src/sys/netinet/udp_usrreq.c:1.253 src/sys/netinet/udp_usrreq.c:1.254
--- src/sys/netinet/udp_usrreq.c:1.253 Thu May 31 07:03:57 2018
+++ src/sys/netinet/udp_usrreq.c Thu May 31 13:51:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: udp_usrreq.c,v 1.253 2018/05/31 07:03:57 maxv Exp $ */
+/* $NetBSD: udp_usrreq.c,v 1.254 2018/05/31 13:51:56 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.253 2018/05/31 07:03:57 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.254 2018/05/31 13:51:56 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1259,11 +1259,7 @@ udp4_espinudp(struct mbuf **mp, int off,
struct mbuf *m = *mp;
uint32_t *marker;
- /*
- * Collapse the mbuf chain if the first mbuf is too short.
- * The longest case is: UDP + max(Non-ESP, Non-IKE) + ESP.
- */
- minlen = off + 2 * sizeof(uint32_t) + sizeof(struct esp);
+ minlen = off + sizeof(struct esp);
if (minlen > m->m_pkthdr.len)
minlen = m->m_pkthdr.len;
