Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/netinet Remove unnecessary #ifdef IPSEC
details: https://anonhg.NetBSD.org/src/rev/e57e7f662a43
branches: trunk
changeset: 818592:e57e7f662a43
user: ozaki-r <ozaki-r%NetBSD.org@localhost>
date: Wed Oct 19 01:13:01 2016 +0000
description:
Remove unnecessary #ifdef IPSEC
The entire function is already in #ifdef IPSEC.
No functional change.
diffstat:
sys/netinet/udp_usrreq.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diffs (32 lines):
diff -r 1a2bc5dd864f -r e57e7f662a43 sys/netinet/udp_usrreq.c
--- a/sys/netinet/udp_usrreq.c Wed Oct 19 01:10:15 2016 +0000
+++ b/sys/netinet/udp_usrreq.c Wed Oct 19 01:13:01 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: udp_usrreq.c,v 1.226 2016/06/10 13:31:44 ozaki-r Exp $ */
+/* $NetBSD: udp_usrreq.c,v 1.227 2016/10/19 01:13:01 ozaki-r 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.226 2016/06/10 13:31:44 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.227 2016/10/19 01:13:01 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1339,13 +1339,9 @@
((u_int16_t *)(tag + 1))[1] = dport;
m_tag_prepend(m, tag);
-#ifdef IPSEC
if (ipsec_used)
ipsec4_common_input(m, iphdrlen, IPPROTO_ESP);
/* XXX: else */
-#else
- esp4_input(m, iphdrlen);
-#endif
/* We handled it, it shouldn't be handled by UDP */
*mp = NULL; /* avoid free by caller ... */
Home |
Main Index |
Thread Index |
Old Index